From 877a868824bea40dc9223e998997841c3093b970 Mon Sep 17 00:00:00 2001 From: Matt Provost Date: Wed, 21 Aug 2024 11:17:17 -0500 Subject: [PATCH 1/6] feat: update cloudflare-go to 0.102.0 Signed-off-by: Matt Provost --- .changelog/3713.txt | 3 ++ go.mod | 2 +- go.sum | 2 ++ .../schema_cloudflare_access_application.go | 28 ++++++++++++++----- 4 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 .changelog/3713.txt diff --git a/.changelog/3713.txt b/.changelog/3713.txt new file mode 100644 index 0000000000..a3d04030ef --- /dev/null +++ b/.changelog/3713.txt @@ -0,0 +1,3 @@ +```release-note:dependency +provider: bump github.com/cloudflare/cloudflare-go from 0.101.0 to 0.102.0 +``` diff --git a/go.mod b/go.mod index ca37aa9a56..337bd1ba7b 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/agext/levenshtein v1.2.3 // indirect - github.com/cloudflare/cloudflare-go v0.101.0 + github.com/cloudflare/cloudflare-go v0.102.0 github.com/fatih/color v1.16.0 // indirect github.com/google/uuid v1.6.0 github.com/hashicorp/errwrap v1.1.0 // indirect diff --git a/go.sum b/go.sum index 002fef70af..5e3f6fa571 100644 --- a/go.sum +++ b/go.sum @@ -53,6 +53,8 @@ github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vc github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= github.com/cloudflare/cloudflare-go v0.101.0 h1:SXWNSEDkbdY84iFIZGyTdWQwDfd98ljv0/4UubpleBQ= github.com/cloudflare/cloudflare-go v0.101.0/go.mod h1:xXQHnoXKR48JlWbFS42i2al3nVqimVhcYvKnIdXLw9g= +github.com/cloudflare/cloudflare-go v0.102.0 h1:+0MGbkirM/yzVLOYpWMgW7CDdKzesSbdwA2Y+rABrWI= +github.com/cloudflare/cloudflare-go v0.102.0/go.mod h1:BOB41tXf31ti/qtBO9paYhyapotQbGRDbQoLOAF7pSg= github.com/cloudflare/cloudflare-go/v2 v2.4.0 h1:gys/26GoVDklgfq8NYV39WgvOEwzK/XAqYObmnI6iFg= github.com/cloudflare/cloudflare-go/v2 v2.4.0/go.mod h1:AoIzb05z/rvdJLztPct4tSa+3IqXJJ6c+pbUFMOlTr8= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= diff --git a/internal/sdkv2provider/schema_cloudflare_access_application.go b/internal/sdkv2provider/schema_cloudflare_access_application.go index db049d123f..0d6e46826b 100644 --- a/internal/sdkv2provider/schema_cloudflare_access_application.go +++ b/internal/sdkv2provider/schema_cloudflare_access_application.go @@ -895,8 +895,13 @@ func convertSaasSchemaToStruct(d *schema.ResourceData) *cloudflare.SaasApplicati customClaims, _ := d.Get("saas_app.0.custom_claim").([]interface{}) for _, customClaims := range customClaims { - claimsAsMap := customClaims.(map[string]interface{}) - SaasConfig.CustomClaims = append(SaasConfig.CustomClaims, convertOIDCClaimSchemaToStruct(claimsAsMap)) + claimAsMap := customClaims.(map[string]interface{}) + claim := convertOIDCClaimSchemaToStruct(claimAsMap) + if SaasConfig.CustomClaims == nil { + SaasConfig.CustomClaims = &[]cloudflare.OIDCClaimConfig{claim} + } else { + *SaasConfig.CustomClaims = append(*SaasConfig.CustomClaims, claim) + } } if _, ok := d.GetOk("saas_app.0.hybrid_and_implicit_options"); ok { @@ -916,7 +921,12 @@ func convertSaasSchemaToStruct(d *schema.ResourceData) *cloudflare.SaasApplicati customAttributes, _ := d.Get("saas_app.0.custom_attribute").([]interface{}) for _, customAttributes := range customAttributes { attributeAsMap := customAttributes.(map[string]interface{}) - SaasConfig.CustomAttributes = append(SaasConfig.CustomAttributes, convertSAMLAttributeSchemaToStruct(attributeAsMap)) + attribute := convertSAMLAttributeSchemaToStruct(attributeAsMap) + if SaasConfig.CustomAttributes == nil { + SaasConfig.CustomAttributes = &[]cloudflare.SAMLAttributeConfig{attribute} + } else { + *SaasConfig.CustomAttributes = append(*SaasConfig.CustomAttributes, convertSAMLAttributeSchemaToStruct(attributeAsMap)) + } } } } @@ -1179,8 +1189,10 @@ func convertSaasStructToSchema(d *schema.ResourceData, app *cloudflare.SaasAppli } var customClaims []interface{} - for _, claim := range app.CustomClaims { - customClaims = append(customClaims, convertOIDCClaimStructToSchema(claim)) + if app.CustomClaims != nil { + for _, claim := range *app.CustomClaims { + customClaims = append(customClaims, convertOIDCClaimStructToSchema(claim)) + } } if len(customClaims) != 0 { m["custom_claim"] = customClaims @@ -1209,8 +1221,10 @@ func convertSaasStructToSchema(d *schema.ResourceData, app *cloudflare.SaasAppli } var customAttributes []interface{} - for _, attr := range app.CustomAttributes { - customAttributes = append(customAttributes, convertSAMLAttributeStructToSchema(attr)) + if app.CustomAttributes != nil { + for _, attr := range *app.CustomAttributes { + customAttributes = append(customAttributes, convertSAMLAttributeStructToSchema(attr)) + } } if len(customAttributes) != 0 { m["custom_attribute"] = customAttributes From 016220e23e0d0adb6e1cd597060e906ae03d77ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 23:09:29 +0000 Subject: [PATCH 2/6] build(deps): bump github.com/aws/aws-sdk-go-v2/service/s3 Bumps the aws group with 1 update: [github.com/aws/aws-sdk-go-v2/service/s3](https://github.com/aws/aws-sdk-go-v2). Updates `github.com/aws/aws-sdk-go-v2/service/s3` from 1.60.1 to 1.61.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.60.1...service/s3/v1.61.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9d36f2d2f6..3a24f2deea 100644 --- a/go.mod +++ b/go.mod @@ -36,7 +36,7 @@ require ( github.com/aws/aws-sdk-go-v2 v1.30.4 github.com/aws/aws-sdk-go-v2/config v1.27.31 github.com/aws/aws-sdk-go-v2/credentials v1.17.30 - github.com/aws/aws-sdk-go-v2/service/s3 v1.60.1 + github.com/aws/aws-sdk-go-v2/service/s3 v1.61.0 github.com/cloudflare/cloudflare-go/v2 v2.4.0 github.com/google/go-cmp v0.6.0 github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 diff --git a/go.sum b/go.sum index a94e1dea24..f0a345a3c5 100644 --- a/go.sum +++ b/go.sum @@ -37,8 +37,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18 h1:tJ5RnkHC github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18/go.mod h1:++NHzT+nAF7ZPrHPsA+ENvsXkOO8wEu+C6RXltAG4/c= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 h1:jg16PhLPUiHIj8zYIW6bqzeQSuHVEiWnGA0Brz5Xv2I= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16/go.mod h1:Uyk1zE1VVdsHSU7096h/rwnXDzOzYQVl+FNPhPw7ShY= -github.com/aws/aws-sdk-go-v2/service/s3 v1.60.1 h1:mx2ucgtv+MWzJesJY9Ig/8AFHgoE5FwLXwUVgW/FGdI= -github.com/aws/aws-sdk-go-v2/service/s3 v1.60.1/go.mod h1:BSPI0EfnYUuNHPS0uqIo5VrRwzie+Fp+YhQOUs16sKI= +github.com/aws/aws-sdk-go-v2/service/s3 v1.61.0 h1:Wb544Wh+xfSXqJ/j3R4aX9wrKUoZsJNmilBYZb3mKQ4= +github.com/aws/aws-sdk-go-v2/service/s3 v1.61.0/go.mod h1:BSPI0EfnYUuNHPS0uqIo5VrRwzie+Fp+YhQOUs16sKI= github.com/aws/aws-sdk-go-v2/service/sso v1.22.5 h1:zCsFCKvbj25i7p1u94imVoO447I/sFv8qq+lGJhRN0c= github.com/aws/aws-sdk-go-v2/service/sso v1.22.5/go.mod h1:ZeDX1SnKsVlejeuz41GiajjZpRSWR7/42q/EyA/QEiM= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5 h1:SKvPgvdvmiTWoi0GAJ7AsJfOz3ngVkD/ERbs5pUnHNI= From 9b7496df7995ae13f6651c5e56acf73f6c8f59b0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 28 Aug 2024 23:09:43 +0000 Subject: [PATCH 3/6] add CHANGELOG for #3823 --- .changelog/3823.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/3823.txt diff --git a/.changelog/3823.txt b/.changelog/3823.txt new file mode 100644 index 0000000000..565c13dc55 --- /dev/null +++ b/.changelog/3823.txt @@ -0,0 +1,3 @@ +```release-note:dependency +provider: bump github.com/aws/aws-sdk-go-v2/service/s3 from 1.60.1 to 1.61.0 in the aws group +``` From 5226eb2f46e7917a16f56973ba5406265df3b59d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 04:14:40 +0000 Subject: [PATCH 4/6] build(deps): bump github.com/cloudflare/cloudflare-go Bumps [github.com/cloudflare/cloudflare-go](https://github.com/cloudflare/cloudflare-go) from 0.101.0 to 0.103.0. - [Release notes](https://github.com/cloudflare/cloudflare-go/releases) - [Changelog](https://github.com/cloudflare/cloudflare-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/cloudflare/cloudflare-go/compare/v0.101.0...v0.103.0) --- updated-dependencies: - dependency-name: github.com/cloudflare/cloudflare-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 7eda61de6d..dc1afde755 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/agext/levenshtein v1.2.3 // indirect - github.com/cloudflare/cloudflare-go v0.102.0 + github.com/cloudflare/cloudflare-go v0.103.0 github.com/fatih/color v1.16.0 // indirect github.com/google/uuid v1.6.0 github.com/hashicorp/errwrap v1.1.0 // indirect diff --git a/go.sum b/go.sum index 6fd1f7688a..72cfbd1811 100644 --- a/go.sum +++ b/go.sum @@ -51,10 +51,8 @@ github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZ github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU= github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= -github.com/cloudflare/cloudflare-go v0.101.0 h1:SXWNSEDkbdY84iFIZGyTdWQwDfd98ljv0/4UubpleBQ= -github.com/cloudflare/cloudflare-go v0.101.0/go.mod h1:xXQHnoXKR48JlWbFS42i2al3nVqimVhcYvKnIdXLw9g= -github.com/cloudflare/cloudflare-go v0.102.0 h1:+0MGbkirM/yzVLOYpWMgW7CDdKzesSbdwA2Y+rABrWI= -github.com/cloudflare/cloudflare-go v0.102.0/go.mod h1:BOB41tXf31ti/qtBO9paYhyapotQbGRDbQoLOAF7pSg= +github.com/cloudflare/cloudflare-go v0.103.0 h1:XXKzgXeUbAo7UTtM4T5wuD2bJPBtNZv7TlZAEy5QI4k= +github.com/cloudflare/cloudflare-go v0.103.0/go.mod h1:0DrjT4g8wgYFYIxhlqR8xi8dNWfyHFGilUkU3+XV8h0= github.com/cloudflare/cloudflare-go/v2 v2.4.0 h1:gys/26GoVDklgfq8NYV39WgvOEwzK/XAqYObmnI6iFg= github.com/cloudflare/cloudflare-go/v2 v2.4.0/go.mod h1:AoIzb05z/rvdJLztPct4tSa+3IqXJJ6c+pbUFMOlTr8= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= From 193f5ea67231e4c1e3f2ecfe56cf79f75e261d63 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 29 Aug 2024 04:14:50 +0000 Subject: [PATCH 5/6] add CHANGELOG for #3824 --- .changelog/3824.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/3824.txt diff --git a/.changelog/3824.txt b/.changelog/3824.txt new file mode 100644 index 0000000000..ba05d1b8a5 --- /dev/null +++ b/.changelog/3824.txt @@ -0,0 +1,3 @@ +```release-note:dependency +provider: bump github.com/cloudflare/cloudflare-go from 0.101.0 to 0.103.0 +``` From c38cca8897aaf2131b1105993f766deef5eb3f9c Mon Sep 17 00:00:00 2001 From: Jacob Bednarz Date: Thu, 29 Aug 2024 14:16:54 +1000 Subject: [PATCH 6/6] Update 3824.txt --- .changelog/3824.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/3824.txt b/.changelog/3824.txt index ba05d1b8a5..7af043a340 100644 --- a/.changelog/3824.txt +++ b/.changelog/3824.txt @@ -1,3 +1,3 @@ ```release-note:dependency -provider: bump github.com/cloudflare/cloudflare-go from 0.101.0 to 0.103.0 +provider: bump github.com/cloudflare/cloudflare-go from 0.102.0 to 0.103.0 ```