Sync monorepo state at "Prepare ucconfig for new release" (#68)

Syncing from
userclouds/userclouds@9d7916997cb9480f7c778381286b2d6d54bf1513

Author: uc-build-user

genprovider/internal/resources/resource.go

@@ -223,6 +223,16 @@ func (r *<< .StructName >>) Create(ctx context.Context, req resource.CreateReque
 
 	<<- if eq .CreateResponseModel .JSONClientModelName >>
 	created := apiResp
+	<<- if eq .StructName "AccessPolicyResource" >>
+	// TODO: (GH #3563) this is a temporary workaround for enums compositeunion/compositeintersection being renamed
+	if created.PolicyType != nil {
+		if *created.PolicyType == "compositeunion" {
+			*created.PolicyType = "composite_or"
+		} else if *created.PolicyType == "compositeintersection" {
+			*created.PolicyType = "composite_and"
+		}
+	}
+	<<- end >>
 	<<- else if not .CreateResponseBodyUsesArray >>
 	created := *apiResp.<< .CreateResponseDataPropertyName >>
 	<<- else >>
@@ -267,6 +277,16 @@ func (r *<< .StructName >>) Read(ctx context.Context, req resource.ReadRequest,
 	}
 	<<- if eq .ReadResponseModel .JSONClientModelName >>
 	current := apiResp
+	<<- if eq .StructName "AccessPolicyResource" >>
+	// TODO: (GH #3563) this is a temporary workaround for enums compositeunion/compositeintersection being renamed
+	if current.PolicyType != nil {
+		if *current.PolicyType == "compositeunion" {
+			*current.PolicyType = "composite_or"
+		} else if *current.PolicyType == "compositeintersection" {
+			*current.PolicyType = "composite_and"
+		}
+	}
+	<<- end >>
 	<<- else >>
 	current := *apiResp.<< .ReadResponseDataPropertyName >>
 	<<- end >>
@@ -329,6 +349,16 @@ func (r *<< .StructName >>) Update(ctx context.Context, req resource.UpdateReque
 	}
 	<<- if eq .UpdateResponseModel .JSONClientModelName >>
 	updated := apiResp
+	<<- if eq .StructName "AccessPolicyResource" >>
+	// TODO: (GH #3563) this is a temporary workaround for enums compositeunion/compositeintersection being renamed
+	if updated.PolicyType != nil {
+		if *updated.PolicyType == "compositeunion" {
+			*updated.PolicyType = "composite_or"
+		} else if *updated.PolicyType == "compositeintersection" {
+			*updated.PolicyType = "composite_and"
+		}
+	}
+	<<- end >>
 	<<- else >>
 	updated := *apiResp.<< .UpdateResponseDataPropertyName >>
 	<<- end >>

internal/provider/tokenizer/access_policy_resource_generated.go

@@ -113,6 +113,14 @@ func (r *AccessPolicyResource) Create(ctx context.Context, req resource.CreateRe
 		return
 	}
 	created := apiResp
+	// TODO: (GH #3563) this is a temporary workaround for enums compositeunion/compositeintersection being renamed
+	if created.PolicyType != nil {
+		if *created.PolicyType == "compositeunion" {
+			*created.PolicyType = "composite_or"
+		} else if *created.PolicyType == "compositeintersection" {
+			*created.PolicyType = "composite_and"
+		}
+	}
 	createdTF, err := PolicyAccessPolicyJSONClientModelToTF(&created)
 	if err != nil {
 		resp.Diagnostics.AddError("Error converting userclouds_access_policy response JSON to Terraform state", err.Error())
@@ -149,6 +157,14 @@ func (r *AccessPolicyResource) Read(ctx context.Context, req resource.ReadReques
 		return
 	}
 	current := apiResp
+	// TODO: (GH #3563) this is a temporary workaround for enums compositeunion/compositeintersection being renamed
+	if current.PolicyType != nil {
+		if *current.PolicyType == "compositeunion" {
+			*current.PolicyType = "composite_or"
+		} else if *current.PolicyType == "compositeintersection" {
+			*current.PolicyType = "composite_and"
+		}
+	}
 
 	newState, err := PolicyAccessPolicyJSONClientModelToTF(&current)
 	if err != nil {
@@ -201,6 +217,14 @@ func (r *AccessPolicyResource) Update(ctx context.Context, req resource.UpdateRe
 		return
 	}
 	updated := apiResp
+	// TODO: (GH #3563) this is a temporary workaround for enums compositeunion/compositeintersection being renamed
+	if updated.PolicyType != nil {
+		if *updated.PolicyType == "compositeunion" {
+			*updated.PolicyType = "composite_or"
+		} else if *updated.PolicyType == "compositeintersection" {
+			*updated.PolicyType = "composite_and"
+		}
+	}
 
 	newState, err := PolicyAccessPolicyJSONClientModelToTF(&updated)
 	if err != nil {