Skip to content

Commit ee79c66

Browse files
committed
Use wrapper for provider agnostic function
1 parent 66ae4d0 commit ee79c66

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

pkg/operator/config/wrappers.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,16 @@ func BucketPath(key string) string {
9292
return ""
9393
}
9494

95+
func ReadBytesFromBucket(key string) ([]byte, error) {
96+
switch Provider {
97+
case types.AWSProviderType:
98+
return AWS.ReadBytesFromS3(Cluster.Bucket, key)
99+
case types.GCPProviderType:
100+
return GCP.ReadBytesFromGCS(GCPCluster.Bucket, key)
101+
}
102+
return nil, nil
103+
}
104+
95105
func ReadJSONFromBucket(objPtr interface{}, key string) error {
96106
switch Provider {
97107
case types.AWSProviderType:

pkg/operator/resources/resources.go

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -235,16 +235,7 @@ func patchAPI(apiConfig *userconfig.API, configFileName string, force bool) (*sp
235235
}
236236

237237
if deployedResource.Kind != userconfig.TrafficSplitterKind {
238-
var bytes []byte
239-
var err error
240-
if config.Provider == types.AWSProviderType {
241-
bytes, err = config.AWS.ReadBytesFromS3(config.Cluster.Bucket, prevAPISpec.ProjectKey)
242-
} else if config.Provider == types.GCPProviderType {
243-
bytes, err = config.GCP.ReadBytesFromGCS(config.GCPCluster.Bucket, prevAPISpec.ProjectKey)
244-
} else {
245-
return nil, "", errors.ErrorUnexpected(fmt.Sprintf("unexpected provider type %s", config.Provider))
246-
}
247-
238+
bytes, err := config.ReadBytesFromBucket(prevAPISpec.ProjectKey)
248239
if err != nil {
249240
return nil, "", err
250241
}

0 commit comments

Comments
 (0)