Skip to content

Commit 17d3044

Browse files
committed
Fix: Sync create resources
1 parent fe0536e commit 17d3044

53 files changed

Lines changed: 207 additions & 381 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

apis/cluster/ism/v1alpha1/zz_generated.deepcopy.go

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/cluster/ism/v1alpha1/zz_policy_types.go

Lines changed: 2 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/namespaced/ism/v1alpha1/zz_generated.deepcopy.go

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/namespaced/ism/v1alpha1/zz_policy_types.go

Lines changed: 2 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/cluster/ism/config.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55

66
"github.com/crossplane/crossplane-runtime/v2/pkg/errors"
7+
78
"github.com/crossplane/upjet/v2/pkg/config"
89
)
910

config/cluster/opensearch/config.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,12 @@ const (
1212
)
1313

1414
// Configure adds configurations for the opensearch group.
15-
func Configure(p *config.Provider) {}
15+
func Configure(p *config.Provider) {
16+
p.AddResourceConfigurator("opensearch_role", func(r *config.Resource) {
17+
r.UseAsync = false
18+
})
19+
20+
p.AddResourceConfigurator("opensearch_user", func(r *config.Resource) {
21+
r.UseAsync = false
22+
})
23+
}

config/cluster/roles/config.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,4 @@ func Configure(p *config.Provider) {
2424
Type: fmt.Sprintf("%s.%s", opensearch.ApisPackagePath, "User"),
2525
}
2626
})
27-
2827
}

config/namespaced/opensearch/config.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,12 @@ const (
1212
)
1313

1414
// Configure adds configurations for the opensearch group.
15-
func Configure(p *config.Provider) {}
15+
func Configure(p *config.Provider) {
16+
p.AddResourceConfigurator("opensearch_role", func(r *config.Resource) {
17+
r.UseAsync = false
18+
})
19+
20+
p.AddResourceConfigurator("opensearch_user", func(r *config.Resource) {
21+
r.UseAsync = false
22+
})
23+
}

config/provider.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ import (
1616

1717
ujconfig "github.com/crossplane/upjet/v2/pkg/config"
1818
ismClustered "github.com/tagesjump/provider-opensearch/config/cluster/ism"
19+
opensearchClustered "github.com/tagesjump/provider-opensearch/config/cluster/opensearch"
1920
rolesClustered "github.com/tagesjump/provider-opensearch/config/cluster/roles"
2021
ismNamespaced "github.com/tagesjump/provider-opensearch/config/namespaced/ism"
22+
opensearchNamespaced "github.com/tagesjump/provider-opensearch/config/namespaced/opensearch"
2123
namespacedClustered "github.com/tagesjump/provider-opensearch/config/namespaced/roles"
2224
)
2325

@@ -74,11 +76,13 @@ func GetProvider(generationProvider bool) (*ujconfig.Provider, error) {
7476
ujconfig.WithFeaturesPackage("internal/features"),
7577
ujconfig.WithDefaultResourceOptions(
7678
ExternalNameConfigurations(),
79+
DisableAsync(),
7780
),
7881
ujconfig.WithReferenceInjectors([]ujconfig.ReferenceInjector{reference.NewInjector(modulePath)}),
7982
)
8083

8184
for _, configure := range []func(provider *ujconfig.Provider){
85+
opensearchClustered.Configure,
8286
rolesClustered.Configure,
8387
ismClustered.Configure,
8488
} {
@@ -110,9 +114,11 @@ func GetProviderNamespaced(generationProvider bool) (*ujconfig.Provider, error)
110114
ujconfig.WithFeaturesPackage("internal/features"),
111115
ujconfig.WithDefaultResourceOptions(
112116
ExternalNameConfigurations(),
117+
DisableAsync(),
113118
))
114119

115120
for _, configure := range []func(provider *ujconfig.Provider){
121+
opensearchNamespaced.Configure,
116122
namespacedClustered.Configure,
117123
ismNamespaced.Configure,
118124
} {
@@ -133,3 +139,9 @@ func resourceList(t map[string]ujconfig.ExternalName) []string {
133139
}
134140
return l
135141
}
142+
143+
func DisableAsync() ujconfig.ResourceOption {
144+
return func(r *ujconfig.Resource) {
145+
r.UseAsync = false
146+
}
147+
}

internal/controller/cluster/anomaly/detection/zz_controller.go

Lines changed: 4 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)