From ff806fefb0f81c04dd1e9a8eff4b60965af12510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20T=C3=BCrken?= Date: Tue, 9 May 2023 14:36:08 +0300 Subject: [PATCH] Fix example manifest for: - aws_autoscaling_policy - aws_securityhub_account - aws_secretsmanager_secret_rotation - aws_ssoadmin_permission_set_inline_policy --- examples/autoscaling/policy.yaml | 14 +++++++++----- examples/secretsmanager/secretrotation.yaml | 2 ++ examples/securityhub/account.yaml | 5 ++--- examples/ssoadmin/permissionsetinlinepolicy.yaml | 7 +++---- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/examples/autoscaling/policy.yaml b/examples/autoscaling/policy.yaml index edd11cfd5b..9ee8196826 100644 --- a/examples/autoscaling/policy.yaml +++ b/examples/autoscaling/policy.yaml @@ -27,14 +27,18 @@ metadata: meta.upbound.io/example-id: ecs/v1beta1/capacityprovider labels: testing.upbound.io/example-name: example - name: example + name: upbound-example-test spec: forProvider: region: us-west-1 availabilityZones: - - us-west-1b - maxSize: 1 - minSize: 1 + - us-west-1a + waitForCapacityTimeout: "0" + maxSize: 5 + minSize: 2 + healthCheckGracePeriod: 300 + healthCheckType: ELB + forceDelete: true launchConfigurationSelector: matchLabels: testing.upbound.io/example-name: as_conf @@ -56,6 +60,6 @@ metadata: name: as-conf spec: forProvider: - imageId: ami-0a1a70369f0fce06a + imageId: ${data.aws_ami.ubuntu.id} instanceType: t2.micro region: us-west-1 \ No newline at end of file diff --git a/examples/secretsmanager/secretrotation.yaml b/examples/secretsmanager/secretrotation.yaml index 1e1bc0f424..87c1e1ef92 100644 --- a/examples/secretsmanager/secretrotation.yaml +++ b/examples/secretsmanager/secretrotation.yaml @@ -3,6 +3,7 @@ kind: SecretRotation metadata: annotations: meta.upbound.io/example-id: secretsmanager/v1beta1/secretrotation + upjet.upbound.io/manual-intervention: "The lambda.Function resource that is dependent on this resource requires manual intervention." labels: testing.upbound.io/example-name: example name: example @@ -60,6 +61,7 @@ kind: Function metadata: annotations: meta.upbound.io/example-id: secretsmanager/v1beta1/secretrotation + upjet.upbound.io/manual-intervention: "This resource needs a s3.Bucket resource containing the hello-python.zip file." labels: testing.upbound.io/example-name: example name: example-secretrotation diff --git a/examples/securityhub/account.yaml b/examples/securityhub/account.yaml index 0935c57f45..78b88d41d3 100644 --- a/examples/securityhub/account.yaml +++ b/examples/securityhub/account.yaml @@ -3,10 +3,9 @@ kind: Account metadata: annotations: meta.upbound.io/example-id: securityhub/v1beta1/account - uptest.upbound.io/pre-delete-hook: testhooks/delete-account-dependent-resources.sh labels: testing.upbound.io/example-name: example - name: example + name: example-${Rand.RFC1123Subdomain} spec: forProvider: - region: us-west-1 \ No newline at end of file + region: us-west-1 diff --git a/examples/ssoadmin/permissionsetinlinepolicy.yaml b/examples/ssoadmin/permissionsetinlinepolicy.yaml index 41a6076473..b989e45d38 100644 --- a/examples/ssoadmin/permissionsetinlinepolicy.yaml +++ b/examples/ssoadmin/permissionsetinlinepolicy.yaml @@ -3,15 +3,14 @@ kind: PermissionSetInlinePolicy metadata: annotations: meta.upbound.io/example-id: ssoadmin/v1beta1/permissionsetinlinepolicy - upjet.upbound.io/manual-intervention: "This resource was skipped because this is dependent on the PermissionSet resource." + upjet.upbound.io/manual-intervention: "This resource requires a valid instanceArn(The Amazon Resource Name (ARN) of the SSO Instance under which + the operation will be executed)." labels: testing.upbound.io/example-name: example name: example spec: forProvider: - instanceArnSelector: - matchLabels: - testing.upbound.io/example-name: example + instanceArn: ${tolist(data.aws_ssoadmin_instances.example.arns)[0]} permissionSetArnSelector: matchLabels: testing.upbound.io/example-name: example