Skip to content

Commit bbe3750

Browse files
committed
Merge and re-number patches
1 parent 395de4d commit bbe3750

25 files changed

+278
-585
lines changed

patches/0027-Do-not-compute-tags_all-at-TF-level.patch

+270-224
Large diffs are not rendered by default.

patches/0029-Fix-markTagsAllNotComputedForResources-to-recognize-.patch

-80
This file was deleted.

patches/0030-Optimize-startup-performance.patch patches/0029-Optimize-startup-performance.patch

+5-6
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,18 @@ index 0000000000..35202ebd58
6161
+ return r.SchemaMap()
6262
+}
6363
diff --git a/shim/shim.go b/shim/shim.go
64-
index e24e53fe17..3378f955bb 100644
64+
index 3fd8dc90f0..fde6157bbf 100644
6565
--- a/shim/shim.go
6666
+++ b/shim/shim.go
67-
@@ -17,7 +17,7 @@ type UpstreamProvider struct {
67+
@@ -17,7 +17,6 @@ type UpstreamProvider struct {
6868
}
6969

7070
func NewUpstreamProvider(ctx context.Context) (UpstreamProvider, error) {
71-
- primary, err := provider.New(ctx)
72-
+ primary, err := provider.New(provider.DisableTagSchemaCheck(ctx))
71+
- ctx = fwprovider.DisableTagSchemaCheck(ctx)
72+
primary, err := provider.New(provider.DisableTagSchemaCheck(ctx))
7373
if err != nil {
7474
return UpstreamProvider{}, err
75-
}
76-
@@ -44,44 +44,42 @@ func NewTagConfig(ctx context.Context, i interface{}) TagConfig {
75+
@@ -45,44 +44,42 @@ func NewTagConfig(ctx context.Context, i interface{}) TagConfig {
7776
// rationale for this is that Pulumi copies tags to tags_all before it hits the TF layer, so these
7877
// attributes must match in schema.
7978
func markTagsAllNotComputedForResources(sdkV2Provider *schema.Provider) {

patches/0031-Fix-job-queue-sdkv2-migration.patch patches/0030-Fix-job-queue-sdkv2-migration.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix job queue sdkv2 migration
55

66

77
diff --git a/internal/service/batch/job_queue_schema.go b/internal/service/batch/job_queue_schema.go
8-
index a4a1625554..8057006cad 100644
8+
index e8e1a272eb..d602d4d301 100644
99
--- a/internal/service/batch/job_queue_schema.go
1010
+++ b/internal/service/batch/job_queue_schema.go
1111
@@ -93,6 +93,7 @@ func upgradeJobQueueResourceStateV0toV1(ctx context.Context, req resource.Upgrad

patches/0033-Fail-fast-when-PF-resources-are-dropped.patch patches/0031-Fail-fast-when-PF-resources-are-dropped.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Fail fast when PF resources are dropped
55

66

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

1414
if err := errors.Join(errs...); err != nil {

patches/0032-DisableTagSchemaCheck-for-PF-provider.patch

-81
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.

patches/0051-Transform-PF-provider-to-make-tags-not-computed.patch

-167
This file was deleted.

0 commit comments

Comments
 (0)