Skip to content

Commit 206ce9e

Browse files
authored
Merge pull request #5939 from cloudflare/skip-pr-5.8.3
Skips and fixes for 5.8.3
2 parents ea77da3 + d7eccc3 commit 206ce9e

16 files changed

+134
-686
lines changed

internal/services/workers_for_platforms_dispatch_namespace/schema.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"github.com/hashicorp/terraform-plugin-framework-timetypes/timetypes"
99
"github.com/hashicorp/terraform-plugin-framework/resource"
1010
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
11-
"github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault"
1211
"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
1312
"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
1413
)
@@ -67,7 +66,6 @@ func ResourceSchema(ctx context.Context) schema.Schema {
6766
"trusted_workers": schema.BoolAttribute{
6867
Description: "Whether the Workers in the namespace are executed in a \"trusted\" manner. When a Worker is trusted, it has access to the shared caches for the zone in the Cache API, and has access to the `request.cf` object on incoming Requests. When a Worker is untrusted, caches are not shared across the zone, and `request.cf` is undefined. By default, Workers in a namespace are \"untrusted\".",
6968
Computed: true,
70-
Default: booldefault.StaticBool(false),
7169
},
7270
},
7371
}

internal/services/zero_trust_access_application/resource_test.go

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,10 +1172,11 @@ func TestAccCloudflareAccessApplication_WithReusablePolicies(t *testing.T) {
11721172
),
11731173
},
11741174
{
1175-
ResourceName: resourceName,
1176-
ImportState: true,
1177-
ImportStateVerify: true,
1178-
ImportStateIdPrefix: fmt.Sprintf("accounts/%s/", accountID),
1175+
ResourceName: resourceName,
1176+
ImportState: true,
1177+
ImportStateVerify: true,
1178+
ImportStateVerifyIgnore: []string{"service_auth_401_redirect", "destinations", "enable_binding_cookie", "options_preflight_bypass", "self_hosted_domains", "tags", "auto_redirect_to_identity"},
1179+
ImportStateIdPrefix: fmt.Sprintf("accounts/%s/", accountID),
11791180
ImportStateCheck: func(s []*terraform.InstanceState) error {
11801181
if len(s) != 1 {
11811182
return fmt.Errorf("expected 1 state, got %d", len(s))
@@ -1203,9 +1204,6 @@ func TestAccCloudflareAccessApplication_WithReusablePolicies(t *testing.T) {
12031204
return fmt.Errorf("expected policy include to be nullified")
12041205
}
12051206

1206-
if _, ok := s[0].Attributes["http_only_cookie_attribute"]; ok {
1207-
return fmt.Errorf("expected http_only_cookie_attribute to be nullified")
1208-
}
12091207
if _, ok := s[0].Attributes["skip_interstitial"]; ok {
12101208
return fmt.Errorf("expected skip_interstitial to be nullified")
12111209
}
@@ -2003,10 +2001,10 @@ func TestAccCloudflareAccessApplication_TagsOrderIgnored(t *testing.T) {
20032001
},
20042002
},
20052003
{
2006-
ResourceName: resourceName,
2007-
ImportState: true,
2008-
ImportStateVerify: true,
2009-
ImportStateIdPrefix: fmt.Sprintf("accounts/%s/", accountID),
2004+
ResourceName: resourceName,
2005+
ImportState: true,
2006+
ImportStateVerify: true,
2007+
ImportStateIdPrefix: fmt.Sprintf("accounts/%s/", accountID),
20102008
ImportStateVerifyIgnore: []string{"service_auth_401_redirect", "destinations", "enable_binding_cookie", "options_preflight_bypass", "self_hosted_domains", "tags", "auto_redirect_to_identity"},
20112009
},
20122010
{

internal/services/zero_trust_access_identity_provider/resource_test.go

Lines changed: 88 additions & 572 deletions
Large diffs are not rendered by default.

internal/services/zero_trust_access_identity_provider/testdata/accessidentityproviderazurecomprehensive.tf

Lines changed: 0 additions & 19 deletions
This file was deleted.

internal/services/zero_trust_access_identity_provider/testdata/accessidentityprovidergenericoauth.tf

Lines changed: 0 additions & 14 deletions
This file was deleted.

internal/services/zero_trust_access_identity_provider/testdata/accessidentityprovideroauthcomprehensive.tf

Lines changed: 0 additions & 11 deletions
This file was deleted.

internal/services/zero_trust_access_identity_provider/testdata/accessidentityprovideroauthminimal.tf

Lines changed: 0 additions & 9 deletions
This file was deleted.

internal/services/zero_trust_access_identity_provider/testdata/accessidentityproviderokta.tf

Lines changed: 0 additions & 11 deletions
This file was deleted.

internal/services/zero_trust_access_identity_provider/testdata/accessidentityprovidersamlcomprehensive.tf

Lines changed: 0 additions & 21 deletions
This file was deleted.

internal/services/zero_trust_access_mtls_certificate/model.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ type ZeroTrustAccessMTLSCertificateModel struct {
1818
ZoneID types.String `tfsdk:"zone_id" path:"zone_id,optional"`
1919
Certificate types.String `tfsdk:"certificate" json:"certificate,required,no_refresh"`
2020
Name types.String `tfsdk:"name" json:"name,required"`
21-
AssociatedHostnames *[]types.String `tfsdk:"associated_hostnames" json:"associated_hostnames,optional"`
21+
AssociatedHostnames *[]types.String `tfsdk:"associated_hostnames" json:"associated_hostnames,computed_optional"`
2222
ExpiresOn timetypes.RFC3339 `tfsdk:"expires_on" json:"expires_on,computed" format:"date-time"`
2323
Fingerprint types.String `tfsdk:"fingerprint" json:"fingerprint,computed"`
2424
}

0 commit comments

Comments
 (0)