Merge branch 'master' into support-teams-accounts-admin-override

cloudflare · Aug 14, 2024 · 928fb7f · 928fb7f
2 parents 75b5cdc + 8cd3d9d
commit 928fb7f
Show file tree

Hide file tree

Showing 21 changed files with 263 additions and 140 deletions.
diff --git a/.changelog/1264.txt b/.changelog/1264.txt
@@ -1,19 +1,19 @@
-```release-note:breaking-change
-pages_deployment: add support for auto pagination
-```
-
-```release-note:enchancement
-pages_deployment: add Force to DeletePagesDeploymentParams
-```
-
-```release-note:breaking-change
-pages_deployment: change DeletePagesDeploymentParams to contain all parameters
-```
-
-```release-note:breaking-change
-pages_project: rename PagesProject to GetPagesProject
-```
-
-```release-note:breaking-change
-pages_project: change to use ResourceContainer for account ID
-```
+```release-note:breaking-change
+pages_deployment: add support for auto pagination
+```
+
+```release-note:enchancement
+pages_deployment: add Force to DeletePagesDeploymentParams
+```
+
+```release-note:breaking-change
+pages_deployment: change DeletePagesDeploymentParams to contain all parameters
+```
+
+```release-note:breaking-change
+pages_project: rename PagesProject to GetPagesProject
+```
+
+```release-note:breaking-change
+pages_project: change to use ResourceContainer for account ID
+```
diff --git a/.changelog/1265.txt b/.changelog/1265.txt
@@ -1,7 +1,7 @@
-```release-note:enhancement
-r2_bucket: add support for getting a bucket
-```
-
-```release-note:breaking-change
-r2_bucket: change creation time from string to *time.Time
-```
+```release-note:enhancement
+r2_bucket: add support for getting a bucket
+```
+
+```release-note:breaking-change
+r2_bucket: change creation time from string to *time.Time
+```
diff --git a/.changelog/1319.txt b/.changelog/1319.txt
@@ -1,59 +1,59 @@
-```release-note:breaking-change
-access_application: refactor methods to use `ResourceContainer` instead of dedicated account/zone methods
-```
-
-```release-note:enhancement
-access_application: add support for auto pagination
-```
-
-```release-note:breaking-change
-access_ca_certificate: refactor methods to use `ResourceContainer` instead of dedicated account/zone methods
-```
-
-```release-note:enhancement
-access_ca_certificate: add support for auto pagination
-```
-
-```release-note:breaking-change
-access_group: refactor methods to use `ResourceContainer` instead of dedicated account/zone methods
-```
-
-```release-note:enhancement
-access_group: add support for auto pagination
-```
-
-```release-note:breaking-change
-access_identity_provider: refactor methods to use `ResourceContainer` instead of dedicated account/zone methods
-```
-
-```release-note:enhancement
-access_identity_provider: add support for auto pagination
-```
-
-```release-note:breaking-change
-access_mutual_tls_certificates: refactor methods to use `ResourceContainer` instead of dedicated account/zone methods
-```
-
-```release-note:enhancement
-access_mutual_tls_certificates: add support for auto pagination
-```
-
-```release-note:breaking-change
-access_organization: refactor methods to use `ResourceContainer` instead of dedicated account/zone methods
-```
-
-```release-note:breaking-change
-access_policy: refactor methods to use `ResourceContainer` instead of dedicated account/zone methods
-```
-
-```release-note:enhancement
-access_policy: add support for auto pagination
-```
-
-```release-note:breaking-change
-access_service_tokens: refactor methods to use `ResourceContainer` instead of dedicated account/zone methods
-```
-
-```release-note:breaking-change
-access_user_token: refactor methods to use `ResourceContainer` instead of dedicated account/zone methods
-```
+```release-note:breaking-change
+access_application: refactor methods to use `ResourceContainer` instead of dedicated account/zone methods
+```
+
+```release-note:enhancement
+access_application: add support for auto pagination
+```
+
+```release-note:breaking-change
+access_ca_certificate: refactor methods to use `ResourceContainer` instead of dedicated account/zone methods
+```
+
+```release-note:enhancement
+access_ca_certificate: add support for auto pagination
+```
+
+```release-note:breaking-change
+access_group: refactor methods to use `ResourceContainer` instead of dedicated account/zone methods
+```
+
+```release-note:enhancement
+access_group: add support for auto pagination
+```
+
+```release-note:breaking-change
+access_identity_provider: refactor methods to use `ResourceContainer` instead of dedicated account/zone methods
+```
+
+```release-note:enhancement
+access_identity_provider: add support for auto pagination
+```
+
+```release-note:breaking-change
+access_mutual_tls_certificates: refactor methods to use `ResourceContainer` instead of dedicated account/zone methods
+```
+
+```release-note:enhancement
+access_mutual_tls_certificates: add support for auto pagination
+```
+
+```release-note:breaking-change
+access_organization: refactor methods to use `ResourceContainer` instead of dedicated account/zone methods
+```
+
+```release-note:breaking-change
+access_policy: refactor methods to use `ResourceContainer` instead of dedicated account/zone methods
+```
+
+```release-note:enhancement
+access_policy: add support for auto pagination
+```
+
+```release-note:breaking-change
+access_service_tokens: refactor methods to use `ResourceContainer` instead of dedicated account/zone methods
+```
+
+```release-note:breaking-change
+access_user_token: refactor methods to use `ResourceContainer` instead of dedicated account/zone methods
+```
diff --git a/.changelog/2793.txt b/.changelog/2793.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+access_application: add `skip_app_launcher_login_page` flag to skip the App Launcher landing page
+```
diff --git a/.changelog/2812.txt b/.changelog/2812.txt
@@ -0,0 +1,3 @@
+```release-notes:enhancement
+worker_bindings: add support for `hyperdrive` bindings
+```
diff --git a/.changelog/2833.txt b/.changelog/2833.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+rulesets: Add `DeleteRulesetRule`
+```
diff --git a/.changelog/2835.txt b/.changelog/2835.txt
@@ -0,0 +1,3 @@
+```release-note:dependency
+deps: bumps golang.org/x/net from 0.27.0 to 0.28.0
+```
diff --git a/.changelog/2838.txt b/.changelog/2838.txt
@@ -0,0 +1,3 @@
+```release-notes:bug
+access_application: enable removing access application custom attributes and claims
+```
diff --git a/.changelog/2886.txt b/.changelog/2886.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+rulesets: Export `DeleteRulesetRuleParams` fields
+```
diff --git a/.changelog/2887.txt b/.changelog/2887.txt
@@ -0,0 +1,3 @@
+```release-notes:bug
+cosmetic: Fix CRLF in changelog and test fixtures
+```
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,26 @@
-## 0.101.0 (Unreleased)
+## 0.102.0 (Unreleased)
+
+ENHANCEMENTS:
+
+* rulesets: Add `DeleteRulesetRule` ([#2833](https://github.com/cloudflare/cloudflare-go/issues/2833))
+* rulesets: Export `DeleteRulesetRuleParams` fields ([#2886](https://github.com/cloudflare/cloudflare-go/issues/2886))
+
+DEPENDENCIES:
+
+* deps: bumps golang.org/x/net from 0.27.0 to 0.28.0 ([#2835](https://github.com/cloudflare/cloudflare-go/issues/2835))
+
+## 0.101.0 (July 31st, 2024)
+
+ENHANCEMENTS:
+
+* access_application: add `skip_app_launcher_login_page` flag to skip the App Launcher landing page ([#2793](https://github.com/cloudflare/cloudflare-go/issues/2793))
+* device_posture_rule: support extended_key_usage, check_private_key, and locations for client_certificate_v2 posture rule ([#1685](https://github.com/cloudflare/cloudflare-go/issues/1685))
+* devices_policy: Add new tunnel_protocol field to policy ([#2778](https://github.com/cloudflare/cloudflare-go/issues/2778))
+* risk_score_integration: Add support for Risk Score Integrations ([#2786](https://github.com/cloudflare/cloudflare-go/issues/2786))
+
+DEPENDENCIES:
+
+* deps: bumps github.com/urfave/cli/v2 from 2.27.2 to 2.27.3 ([#2787](https://github.com/cloudflare/cloudflare-go/issues/2787))
 
 ## 0.100.0 (July 18th, 2024)
 

diff --git a/access_application.go b/access_application.go
@@ -224,15 +224,15 @@ type SaasApplication struct {
 	AuthType  string     `json:"auth_type,omitempty"`
 
 	// SAML saas app
-	ConsumerServiceUrl            string                `json:"consumer_service_url,omitempty"`
-	SPEntityID                    string                `json:"sp_entity_id,omitempty"`
-	IDPEntityID                   string                `json:"idp_entity_id,omitempty"`
-	NameIDFormat                  string                `json:"name_id_format,omitempty"`
-	SSOEndpoint                   string                `json:"sso_endpoint,omitempty"`
-	DefaultRelayState             string                `json:"default_relay_state,omitempty"`
-	CustomAttributes              []SAMLAttributeConfig `json:"custom_attributes,omitempty"`
-	NameIDTransformJsonata        string                `json:"name_id_transform_jsonata,omitempty"`
-	SamlAttributeTransformJsonata string                `json:"saml_attribute_transform_jsonata"`
+	ConsumerServiceUrl            string                 `json:"consumer_service_url,omitempty"`
+	SPEntityID                    string                 `json:"sp_entity_id,omitempty"`
+	IDPEntityID                   string                 `json:"idp_entity_id,omitempty"`
+	NameIDFormat                  string                 `json:"name_id_format,omitempty"`
+	SSOEndpoint                   string                 `json:"sso_endpoint,omitempty"`
+	DefaultRelayState             string                 `json:"default_relay_state,omitempty"`
+	CustomAttributes              *[]SAMLAttributeConfig `json:"custom_attributes"`
+	NameIDTransformJsonata        string                 `json:"name_id_transform_jsonata,omitempty"`
+	SamlAttributeTransformJsonata string                 `json:"saml_attribute_transform_jsonata"`
 
 	// OIDC saas app
 	ClientID                     string                                     `json:"client_id,omitempty"`
@@ -242,19 +242,20 @@ type SaasApplication struct {
 	Scopes                       []string                                   `json:"scopes,omitempty"`
 	AppLauncherURL               string                                     `json:"app_launcher_url,omitempty"`
 	GroupFilterRegex             string                                     `json:"group_filter_regex,omitempty"`
-	CustomClaims                 []OIDCClaimConfig                          `json:"custom_claims,omitempty"`
+	CustomClaims                 *[]OIDCClaimConfig                         `json:"custom_claims"`
 	AllowPKCEWithoutClientSecret *bool                                      `json:"allow_pkce_without_client_secret,omitempty"`
 	RefreshTokenOptions          *RefreshTokenOptions                       `json:"refresh_token_options,omitempty"`
 	HybridAndImplicitOptions     *AccessApplicationHybridAndImplicitOptions `json:"hybrid_and_implicit_options,omitempty"`
 	AccessTokenLifetime          string                                     `json:"access_token_lifetime,omitempty"`
 }
 
 type AccessAppLauncherCustomization struct {
-	LandingPageDesign     AccessLandingPageDesign `json:"landing_page_design"`
-	LogoURL               string                  `json:"app_launcher_logo_url"`
-	HeaderBackgroundColor string                  `json:"header_bg_color"`
-	BackgroundColor       string                  `json:"bg_color"`
-	FooterLinks           []AccessFooterLink      `json:"footer_links"`
+	LandingPageDesign        AccessLandingPageDesign `json:"landing_page_design"`
+	LogoURL                  string                  `json:"app_launcher_logo_url"`
+	HeaderBackgroundColor    string                  `json:"header_bg_color"`
+	BackgroundColor          string                  `json:"bg_color"`
+	FooterLinks              []AccessFooterLink      `json:"footer_links"`
+	SkipAppLauncherLoginPage *bool                   `json:"skip_app_launcher_login_page,omitempty"`
 }
 
 type AccessFooterLink struct {

diff --git a/access_application_test.go b/access_application_test.go
@@ -1011,7 +1011,7 @@ func TestCreateSAMLSaasAccessApplications(t *testing.T) {
 			SPEntityID:         "dash.example.com",
 			NameIDFormat:       "id",
 			DefaultRelayState:  "https://saas.example.com",
-			CustomAttributes: []SAMLAttributeConfig{
+			CustomAttributes: &[]SAMLAttributeConfig{
 				{
 					Name:       "test1",
 					NameFormat: "urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified",
@@ -1166,7 +1166,7 @@ func TestCreateOIDCSaasAccessApplications(t *testing.T) {
 			AppLauncherURL:               "https://saas.example.com",
 			GroupFilterRegex:             ".*",
 			AllowPKCEWithoutClientSecret: BoolPtr(false),
-			CustomClaims: []OIDCClaimConfig{
+			CustomClaims: &[]OIDCClaimConfig{
 				{
 					Name:     "test1",
 					Source:   SourceConfig{Name: "test1"},
@@ -1197,7 +1197,7 @@ func TestCreateOIDCSaasAccessApplications(t *testing.T) {
 			AppLauncherURL:               "https://saas.example.com",
 			GroupFilterRegex:             ".*",
 			AllowPKCEWithoutClientSecret: BoolPtr(false),
-			CustomClaims: []OIDCClaimConfig{
+			CustomClaims: &[]OIDCClaimConfig{
 				{
 					Name:     "test1",
 					Source:   SourceConfig{Name: "test1"},
@@ -1229,7 +1229,7 @@ func TestCreateOIDCSaasAccessApplications(t *testing.T) {
 			AppLauncherURL:               "https://saas.example.com",
 			GroupFilterRegex:             ".*",
 			AllowPKCEWithoutClientSecret: BoolPtr(false),
-			CustomClaims: []OIDCClaimConfig{
+			CustomClaims: &[]OIDCClaimConfig{
 				{
 					Name:     "test1",
 					Source:   SourceConfig{Name: "test1"},
@@ -1292,7 +1292,8 @@ func TestCreateApplicationWithAccessAppLauncherCustomization(t *testing.T) {
 						"url": "https://somesite.com",
 						"name": "bug"
 					}
-				]
+				],
+				"skip_app_launcher_login_page": true
 			}
 		}
 		`)
@@ -1332,6 +1333,7 @@ func TestCreateApplicationWithAccessAppLauncherCustomization(t *testing.T) {
 					Name: "bug",
 				},
 			},
+			SkipAppLauncherLoginPage: BoolPtr(true),
 		},
 	}
 
@@ -1357,6 +1359,7 @@ func TestCreateApplicationWithAccessAppLauncherCustomization(t *testing.T) {
 					Name: "bug",
 				},
 			},
+			SkipAppLauncherLoginPage: BoolPtr(true),
 		},
 	})
 

diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/stretchr/testify v1.9.0
 	github.com/urfave/cli/v2 v2.27.3
-	golang.org/x/net v0.27.0
+	golang.org/x/net v0.28.0
 	golang.org/x/time v0.5.0
 )
 
@@ -25,6 +25,6 @@ require (
 	github.com/rogpeppe/go-internal v1.8.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
-	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -39,10 +39,10 @@ github.com/urfave/cli/v2 v2.27.3 h1:/POWahRmdh7uztQ3CYnaDddk0Rm90PyOgIxgW2rr41M=
 github.com/urfave/cli/v2 v2.27.3/go.mod h1:m4QzxcD2qpra4z7WhzEGn74WZLViBnMpb1ToCAKdGRQ=
 github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
 github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
-golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
-golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
-golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
+golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
+golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
+golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=