Skip to content

Commit

Permalink
Merge pull request #3571 from alphagov/185992558-disable-post-11-mysq…
Browse files Browse the repository at this point in the history 
…l-57

Disable postgresql 11 and mysql 5.7 plans
  • Loading branch information
Ben Corlett committed Jan 24, 2024
2 parents ebba2d4 + c391792 commit 009f0d9
Show file tree
Hide file tree
Showing 3 changed files with 76 additions and 76 deletions.
98 changes: 49 additions & 49 deletions concourse/pipelines/create-cloudfoundry.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3807,31 +3807,6 @@ jobs:
cf create-service-broker rds-broker rds-broker "${RDS_BROKER_PASS}" "https://${RDS_BROKER_SERVER}"
fi
# Enable supported plans
cat <<EOF | xargs -n1 cf enable-service-access mysql -b rds-broker -p
tiny-unencrypted-5.7
small-5.7
small-ha-5.7
medium-ha-5.7
medium-5.7
large-ha-5.7
large-5.7
xlarge-ha-5.7
xlarge-5.7
EOF
cat <<EOF | xargs -n1 cf enable-service-access mysql -b rds-broker -p
tiny-unencrypted-5.7-high-iops
small-5.7-high-iops
small-ha-5.7-high-iops
medium-ha-5.7-high-iops
medium-5.7-high-iops
large-ha-5.7-high-iops
large-5.7-high-iops
xlarge-ha-5.7-high-iops
xlarge-5.7-high-iops
EOF
cat <<EOF | xargs -n1 cf enable-service-access mysql -b rds-broker -p
tiny-unencrypted-8.0
small-8.0
Expand All @@ -3856,30 +3831,6 @@ jobs:
xlarge-8.0-high-iops
EOF
cat <<EOF | xargs -n1 cf enable-service-access postgres -b rds-broker -p
tiny-unencrypted-11
small-11
small-ha-11
medium-11
medium-ha-11
large-11
large-ha-11
xlarge-11
xlarge-ha-11
EOF
cat <<EOF | xargs -n1 cf enable-service-access postgres -b rds-broker -p
tiny-unencrypted-11-high-iops
small-11-high-iops
small-ha-11-high-iops
medium-11-high-iops
medium-ha-11-high-iops
large-11-high-iops
large-ha-11-high-iops
xlarge-11-high-iops
xlarge-ha-11-high-iops
EOF
# Enable Postgres 12 plans
cat <<EOF | xargs -n1 cf enable-service-access postgres -b rds-broker -p
tiny-unencrypted-12
Expand Down Expand Up @@ -3977,6 +3928,55 @@ jobs:
xlarge-ha-10-high-iops
EOF
# Enable supported plans
cat <<EOF | xargs -n1 cf disable-service-access mysql -b rds-broker -p
tiny-unencrypted-5.7
small-5.7
small-ha-5.7
medium-ha-5.7
medium-5.7
large-ha-5.7
large-5.7
xlarge-ha-5.7
xlarge-5.7
EOF
cat <<EOF | xargs -n1 cf disable-service-access mysql -b rds-broker -p
tiny-unencrypted-5.7-high-iops
small-5.7-high-iops
small-ha-5.7-high-iops
medium-ha-5.7-high-iops
medium-5.7-high-iops
large-ha-5.7-high-iops
large-5.7-high-iops
xlarge-ha-5.7-high-iops
xlarge-5.7-high-iops
EOF
cat <<EOF | xargs -n1 cf disable-service-access postgres -b rds-broker -p
tiny-unencrypted-11
small-11
small-ha-11
medium-11
medium-ha-11
large-11
large-ha-11
xlarge-11
xlarge-ha-11
EOF
cat <<EOF | xargs -n1 cf disable-service-access postgres -b rds-broker -p
tiny-unencrypted-11-high-iops
small-11-high-iops
small-ha-11-high-iops
medium-11-high-iops
medium-ha-11-high-iops
large-11-high-iops
large-ha-11-high-iops
xlarge-11-high-iops
xlarge-ha-11-high-iops
EOF
- task: register-cdn-broker
tags: [colocated-with-web]
config:
Expand Down
18 changes: 9 additions & 9 deletions platform-tests/broker-acceptance/mysql_service_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ var _ = Describe("MySQL backing service", func() {
plans := cf.Cf("marketplace", "-e", serviceName).Wait(testConfig.DefaultTimeoutDuration())
Expect(plans).To(Exit(0))
cfMarketplaceOutput := string(plans.Out.Contents())
Expect(cfMarketplaceOutput).To(ContainSubstring("tiny-unencrypted-5.7"))
Expect(cfMarketplaceOutput).To(ContainSubstring("small-5.7"))
Expect(cfMarketplaceOutput).To(ContainSubstring("small-ha-5.7"))
Expect(cfMarketplaceOutput).To(ContainSubstring("medium-5.7"))
Expect(cfMarketplaceOutput).To(ContainSubstring("medium-ha-5.7"))
Expect(cfMarketplaceOutput).To(ContainSubstring("large-5.7"))
Expect(cfMarketplaceOutput).To(ContainSubstring("large-ha-5.7"))
Expect(cfMarketplaceOutput).To(ContainSubstring("xlarge-5.7"))
Expect(cfMarketplaceOutput).To(ContainSubstring("xlarge-ha-5.7"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("tiny-unencrypted-5.7"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("small-5.7"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("small-ha-5.7"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("medium-5.7"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("medium-ha-5.7"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("large-5.7"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("large-ha-5.7"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("xlarge-5.7"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("xlarge-ha-5.7"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("small-unencrypted-5.7"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("small-ha-unencrypted-5.7"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("medium-unencrypted-5.7"))
Expand Down
36 changes: 18 additions & 18 deletions platform-tests/broker-acceptance/postgres_service_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,24 @@ var _ = Describe("Postgres backing service", func() {
Expect(plans).To(Exit(0))
cfMarketplaceOutput := string(plans.Out.Contents())

Expect(cfMarketplaceOutput).To(ContainSubstring("tiny-unencrypted-11"))
Expect(cfMarketplaceOutput).To(ContainSubstring("small-11"))
Expect(cfMarketplaceOutput).To(ContainSubstring("small-ha-11"))
Expect(cfMarketplaceOutput).To(ContainSubstring("medium-11"))
Expect(cfMarketplaceOutput).To(ContainSubstring("medium-ha-11"))
Expect(cfMarketplaceOutput).To(ContainSubstring("large-11"))
Expect(cfMarketplaceOutput).To(ContainSubstring("large-ha-11"))
Expect(cfMarketplaceOutput).To(ContainSubstring("xlarge-11"))
Expect(cfMarketplaceOutput).To(ContainSubstring("xlarge-ha-11"))
Expect(cfMarketplaceOutput).To(ContainSubstring("tiny-unencrypted-11-high-iops"))
Expect(cfMarketplaceOutput).To(ContainSubstring("small-11-high-iops"))
Expect(cfMarketplaceOutput).To(ContainSubstring("small-ha-11-high-iops"))
Expect(cfMarketplaceOutput).To(ContainSubstring("medium-11-high-iops"))
Expect(cfMarketplaceOutput).To(ContainSubstring("medium-ha-11-high-iops"))
Expect(cfMarketplaceOutput).To(ContainSubstring("large-11-high-iops"))
Expect(cfMarketplaceOutput).To(ContainSubstring("large-ha-11-high-iops"))
Expect(cfMarketplaceOutput).To(ContainSubstring("xlarge-11-high-iops"))
Expect(cfMarketplaceOutput).To(ContainSubstring("xlarge-ha-11-high-iops"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("tiny-unencrypted-11"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("small-11"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("small-ha-11"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("medium-11"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("medium-ha-11"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("large-11"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("large-ha-11"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("xlarge-11"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("xlarge-ha-11"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("tiny-unencrypted-11-high-iops"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("small-11-high-iops"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("small-ha-11-high-iops"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("medium-11-high-iops"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("medium-ha-11-high-iops"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("large-11-high-iops"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("large-ha-11-high-iops"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("xlarge-11-high-iops"))
Expect(cfMarketplaceOutput).ToNot(ContainSubstring("xlarge-ha-11-high-iops"))

Expect(cfMarketplaceOutput).To(ContainSubstring("tiny-unencrypted-12"))
Expect(cfMarketplaceOutput).To(ContainSubstring("small-12"))
Expand Down

0 comments on commit 009f0d9

Please sign in to comment.