Skip to content

Automate removing Computed on tags_all for PF resources #4151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
494 changes: 270 additions & 224 deletions patches/0027-Do-not-compute-tags_all-at-TF-level.patch

Large diffs are not rendered by default.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,18 @@ index 0000000000..35202ebd58
+ return r.SchemaMap()
+}
diff --git a/shim/shim.go b/shim/shim.go
index e24e53fe17..3378f955bb 100644
index 3fd8dc90f0..fde6157bbf 100644
--- a/shim/shim.go
+++ b/shim/shim.go
@@ -17,7 +17,7 @@ type UpstreamProvider struct {
@@ -17,7 +17,6 @@ type UpstreamProvider struct {
}

func NewUpstreamProvider(ctx context.Context) (UpstreamProvider, error) {
- primary, err := provider.New(ctx)
+ primary, err := provider.New(provider.DisableTagSchemaCheck(ctx))
- ctx = fwprovider.DisableTagSchemaCheck(ctx)
primary, err := provider.New(provider.DisableTagSchemaCheck(ctx))
if err != nil {
return UpstreamProvider{}, err
}
@@ -44,44 +44,42 @@ func NewTagConfig(ctx context.Context, i interface{}) TagConfig {
@@ -45,44 +44,42 @@ func NewTagConfig(ctx context.Context, i interface{}) TagConfig {
// rationale for this is that Pulumi copies tags to tags_all before it hits the TF layer, so these
// attributes must match in schema.
func markTagsAllNotComputedForResources(sdkV2Provider *schema.Provider) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Fix job queue sdkv2 migration


diff --git a/internal/service/batch/job_queue_schema.go b/internal/service/batch/job_queue_schema.go
index a4a1625554..8057006cad 100644
index e8e1a272eb..d602d4d301 100644
--- a/internal/service/batch/job_queue_schema.go
+++ b/internal/service/batch/job_queue_schema.go
@@ -93,6 +93,7 @@ func upgradeJobQueueResourceStateV0toV1(ctx context.Context, req resource.Upgrad
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Fail fast when PF resources are dropped


diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go
index 257f831fbb..2d28d90310 100644
index 00818e8325..b09529ad3e 100644
--- a/internal/provider/fwprovider/provider.go
+++ b/internal/provider/fwprovider/provider.go
@@ -448,9 +448,7 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
@@ -443,9 +443,7 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
}

if err := errors.Join(errs...); err != nil {
Expand Down
81 changes: 0 additions & 81 deletions patches/0032-DisableTagSchemaCheck-for-PF-provider.patch

This file was deleted.

This file was deleted.

Loading
Loading