fix: correct wiring of disable s3express auth toggle (#2394)

lucix-aws · web-flow · commit 94a398007cfa · 2023-11-28T14:38:55.000-05:00
diff --git a/.changelog/03de8b0c1add4877bcfd5472db61ee82.json b/.changelog/03de8b0c1add4877bcfd5472db61ee82.json
@@ -0,0 +1,8 @@
+{
+    "id": "03de8b0c-1add-4877-bcfd-5472db61ee82",
+    "type": "bugfix",
+    "description": "Correct resolution of S3Express auth disable toggle.",
+    "modules": [
+        "config"
+    ]
+}
diff --git a/config/load_options.go b/config/load_options.go
@@ -207,8 +207,8 @@ type LoadOptions struct {
 	// The sdk app ID retrieved from env var or shared config to be added to request user agent header
 	AppID string
 
-	// Whether S3 S3Beta2022a auth is disabled.
-	S3DisableS3Beta2022aAuth *bool
+	// Whether S3 Express auth is disabled.
+	S3DisableExpressAuth *bool
 }
 
 func (o LoadOptions) getDefaultsMode(ctx context.Context) (aws.DefaultsMode, bool, error) {
@@ -1048,21 +1048,21 @@ func WithDefaultsMode(mode aws.DefaultsMode, optFns ...func(options *DefaultsMod
 	}
 }
 
-// GetS3DisableS3Beta2022aAuth returns the configured value for
-// [EnvConfig.S3DisableS3Beta2022aAuth].
-func (o LoadOptions) GetS3DisableS3Beta2022aAuth() (value, ok bool) {
-	if o.S3DisableS3Beta2022aAuth == nil {
+// GetS3DisableExpressAuth returns the configured value for
+// [EnvConfig.S3DisableExpressAuth].
+func (o LoadOptions) GetS3DisableExpressAuth() (value, ok bool) {
+	if o.S3DisableExpressAuth == nil {
 		return false, false
 	}
 
-	return *o.S3DisableS3Beta2022aAuth, true
+	return *o.S3DisableExpressAuth, true
 }
 
-// WithS3DisableS3Beta2022aAuth sets [LoadOptions.S3DisableS3Beta2022aAuth]
+// WithS3DisableExpressAuth sets [LoadOptions.S3DisableExpressAuth]
 // to the value provided.
-func WithS3DisableS3Beta2022aAuth(v bool) LoadOptionsFunc {
+func WithS3DisableExpressAuth(v bool) LoadOptionsFunc {
 	return func(o *LoadOptions) error {
-		o.S3DisableS3Beta2022aAuth = &v
+		o.S3DisableExpressAuth = &v
 		return nil
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -207,8 +207,8 @@ type LoadOptions struct {`
`207`	`207`	`// The sdk app ID retrieved from env var or shared config to be added to request user agent header`
`208`	`208`	`AppID string`
`209`	`209`
`210`		`- // Whether S3 S3Beta2022a auth is disabled.`
`211`		`- S3DisableS3Beta2022aAuth *bool`
	`210`	`+ // Whether S3 Express auth is disabled.`
	`211`	`+ S3DisableExpressAuth *bool`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`func (o LoadOptions) getDefaultsMode(ctx context.Context) (aws.DefaultsMode, bool, error) {`
`@@ -1048,21 +1048,21 @@ func WithDefaultsMode(mode aws.DefaultsMode, optFns ...func(options *DefaultsMod`
`1048`	`1048`	`}`
`1049`	`1049`	`}`
`1050`	`1050`
`1051`		`-// GetS3DisableS3Beta2022aAuth returns the configured value for`
`1052`		`-// [EnvConfig.S3DisableS3Beta2022aAuth].`
`1053`		`-func (o LoadOptions) GetS3DisableS3Beta2022aAuth() (value, ok bool) {`
`1054`		`- if o.S3DisableS3Beta2022aAuth == nil {`
	`1051`	`+// GetS3DisableExpressAuth returns the configured value for`
	`1052`	`+// [EnvConfig.S3DisableExpressAuth].`
	`1053`	`+func (o LoadOptions) GetS3DisableExpressAuth() (value, ok bool) {`
	`1054`	`+ if o.S3DisableExpressAuth == nil {`
`1055`	`1055`	`return false, false`
`1056`	`1056`	`}`
`1057`	`1057`
`1058`		`- return *o.S3DisableS3Beta2022aAuth, true`
	`1058`	`+ return *o.S3DisableExpressAuth, true`
`1059`	`1059`	`}`
`1060`	`1060`
`1061`		`-// WithS3DisableS3Beta2022aAuth sets [LoadOptions.S3DisableS3Beta2022aAuth]`
	`1061`	`+// WithS3DisableExpressAuth sets [LoadOptions.S3DisableExpressAuth]`
`1062`	`1062`	`// to the value provided.`
`1063`		`-func WithS3DisableS3Beta2022aAuth(v bool) LoadOptionsFunc {`
	`1063`	`+func WithS3DisableExpressAuth(v bool) LoadOptionsFunc {`
`1064`	`1064`	`return func(o *LoadOptions) error {`
`1065`		`- o.S3DisableS3Beta2022aAuth = &v`
	`1065`	`+ o.S3DisableExpressAuth = &v`
`1066`	`1066`	`return nil`
`1067`	`1067`	`}`
`1068`	`1068`	`}`