Skip to content

Commit 857443c

Browse files
committed
Increase timeouts
Signed-off-by: Sergen Yalçın <yalcinsergen97@gmail.com>
1 parent 5c909fe commit 857443c

20 files changed

Lines changed: 187 additions & 28 deletions

File tree

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

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

apis/cluster/mq/v1alpha1/zz_user_types.go

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

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

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

apis/namespaced/mq/v1alpha1/zz_user_types.go

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

config/cluster/mq/config.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,15 @@ func Configure(p *config.Provider) { //nolint:gocyclo
7575
TerraformName: "aws_mq_broker",
7676
}
7777
r.Version = "v1alpha1"
78-
r.MetaResource = &registry.Resource{
79-
ArgumentDocs: make(map[string]string),
80-
}
81-
r.MetaResource.ArgumentDocs["console_access"] = `- (Optional) Whether to enable console access for the user.`
82-
r.MetaResource.ArgumentDocs["pending"] = `- Tracks pending modifications returned by the AWS MQ API. This field allows you to monitor changes that are actively being processed before they are fully applied.`
83-
r.MetaResource.ArgumentDocs["pending.console_access"] = `- The pending console access value if a change to console access is being processed.`
84-
r.MetaResource.ArgumentDocs["pending.pending_change"] = `- The type of pending change. Valid values are CREATE, UPDATE, or DELETE.`
78+
r.MetaResource = &registry.Resource{}
79+
r.RemoveSingletonListConversion("pending")
80+
// set the path pending as an embedded object to honor
81+
// its single nested block schema. We need to have it converted
82+
// into an embedded object but there's no need for
83+
// the Terraform conversion (it already needs to be treated
84+
// as an object at the Terraform layer and in the current MR API,
85+
// it's already an embedded object).
86+
r.SchemaElementOptions.SetEmbeddedObject("pending")
8587
})
8688

8789
p.AddResourceConfigurator("aws_mq_configuration", func(r *config.Resource) {

config/namespaced/mq/config.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,15 @@ func Configure(p *config.Provider) { //nolint:gocyclo
7575
TerraformName: "aws_mq_broker",
7676
}
7777
r.Version = "v1alpha1"
78-
r.MetaResource = &registry.Resource{
79-
ArgumentDocs: make(map[string]string),
80-
}
81-
r.MetaResource.ArgumentDocs["console_access"] = `- (Optional) Whether to enable console access for the user.`
82-
r.MetaResource.ArgumentDocs["pending"] = `- Tracks pending modifications returned by the AWS MQ API. This field allows you to monitor changes that are actively being processed before they are fully applied.`
83-
r.MetaResource.ArgumentDocs["pending.console_access"] = `- The pending console access value if a change to console access is being processed.`
84-
r.MetaResource.ArgumentDocs["pending.pending_change"] = `- The type of pending change. Valid values are CREATE, UPDATE, or DELETE.`
78+
r.MetaResource = &registry.Resource{}
79+
r.RemoveSingletonListConversion("pending")
80+
// set the path pending as an embedded object to honor
81+
// its single nested block schema. We need to have it converted
82+
// into an embedded object but there's no need for
83+
// the Terraform conversion (it already needs to be treated
84+
// as an object at the Terraform layer and in the current MR API,
85+
// it's already an embedded object).
86+
r.SchemaElementOptions.SetEmbeddedObject("pending")
8587
})
8688

8789
p.AddResourceConfigurator("aws_mq_configuration", func(r *config.Resource) {

config/schema.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

examples/mq/cluster/v1alpha1/user-with-consoleAccess.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ kind: User
77
metadata:
88
annotations:
99
meta.upbound.io/example-id: mq/v1alpha1/user
10+
uptest.upbound.io/timeout: "3600"
1011
labels:
1112
testing.upbound.io/example-name: example
1213
name: example

examples/mq/cluster/v1alpha1/user-with-groups.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ kind: User
77
metadata:
88
annotations:
99
meta.upbound.io/example-id: mq/v1alpha1/user
10+
uptest.upbound.io/timeout: "3600"
1011
labels:
1112
testing.upbound.io/example-name: example
1213
name: mquser1

examples/mq/cluster/v1alpha1/user.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ kind: User
77
metadata:
88
annotations:
99
meta.upbound.io/example-id: mq/v1alpha1/user
10+
uptest.upbound.io/timeout: "3600"
1011
labels:
1112
testing.upbound.io/example-name: example
1213
name: example

0 commit comments

Comments
 (0)