github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-28 13:03:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #55611 from stewart-yu/regexMatch

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

using Regexp Match 

**What this PR does / why we need it**:
using regexp match achieve find efficiently

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-11-21 05:58:23 -08:00 committed by GitHub
commit 5353d588b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/cloudprovider/providers/aws/instances.go
View File

@ -25,10 +25,14 @@ import (
"github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2"
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
"regexp"
"sync" "sync"
"time" "time"
) )
// awsInstanceRegMatch represents Regex Match for AWS instance.
var awsInstanceRegMatch = regexp.MustCompile("^i-[^/]*$")
// awsInstanceID represents the ID of the instance in the AWS API, e.g. i-12345678 // awsInstanceID represents the ID of the instance in the AWS API, e.g. i-12345678
// The "traditional" format is "i-12345678" // The "traditional" format is "i-12345678"
// A new longer format is also being introduced: "i-12345678abcdef01" // A new longer format is also being introduced: "i-12345678abcdef01"
@ -76,8 +80,7 @@ func (name kubernetesInstanceID) mapToAWSInstanceID() (awsInstanceID, error) {
// We sanity check the resulting volume; the two known formats are // We sanity check the resulting volume; the two known formats are
// i-12345678 and i-12345678abcdef01 // i-12345678 and i-12345678abcdef01
// TODO: Regex match? if awsID == "" || !awsInstanceRegMatch.MatchString(awsID) {
if awsID == "" || strings.Contains(awsID, "/") || !strings.HasPrefix(awsID, "i-") {
return "", fmt.Errorf("Invalid format for AWS instance (%s)", name) return "", fmt.Errorf("Invalid format for AWS instance (%s)", name)
} }

7
pkg/cloudprovider/providers/aws/volumes.go
View File

@ -19,11 +19,15 @@ package aws
import ( import (
"fmt" "fmt"
"net/url" "net/url"
"regexp"
"strings" "strings"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
) )
// awsVolumeRegMatch represents Regex Match for AWS volume.
var awsVolumeRegMatch = regexp.MustCompile("^vol-[^/]*$")
// awsVolumeID represents the ID of the volume in the AWS API, e.g. vol-12345678 // awsVolumeID represents the ID of the volume in the AWS API, e.g. vol-12345678
// The "traditional" format is "vol-12345678" // The "traditional" format is "vol-12345678"
// A new longer format is also being introduced: "vol-12345678abcdef01" // A new longer format is also being introduced: "vol-12345678abcdef01"
@ -75,8 +79,7 @@ func (name KubernetesVolumeID) mapToAWSVolumeID() (awsVolumeID, error) {
// We sanity check the resulting volume; the two known formats are // We sanity check the resulting volume; the two known formats are
// vol-12345678 and vol-12345678abcdef01 // vol-12345678 and vol-12345678abcdef01
// TODO: Regex match? if !awsVolumeRegMatch.MatchString(awsID) {
if strings.Contains(awsID, "/") || !strings.HasPrefix(awsID, "vol-") {
return "", fmt.Errorf("Invalid format for AWS volume (%s)", name) return "", fmt.Errorf("Invalid format for AWS volume (%s)", name)
} }