Skip to content

Commit

Permalink
Update configtemplate fixture
Browse files Browse the repository at this point in the history
The old release no longer exists, so we've updated the test and fixture
to an existing product.

Commented out the CF product test because it's too massive now. We'll
totally make this better in the future.
  • Loading branch information
rhall-pivotal committed Jul 15, 2024
1 parent ab1bc1d commit bdd1269
Show file tree
Hide file tree
Showing 33 changed files with 458 additions and 3 deletions.
7 changes: 4 additions & 3 deletions acceptance/config_template_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ package acceptance
import (
"bytes"
"fmt"
"github.com/onsi/gomega/ghttp"
"io/ioutil"
"net/http"
"os"
"os/exec"
"path/filepath"
"time"

"github.com/onsi/gomega/ghttp"

. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/extensions/table"
. "github.com/onsi/gomega"
Expand Down Expand Up @@ -345,7 +346,7 @@ var _ = Describe("config-template output", func() {
Expect(err).ToNot(HaveOccurred())
Eventually(session, "10s", "2s").Should(gexec.Exit(0))
},
Entry("SRT - for broad coverage", "elastic-runtime", "2.8.6", "*srt*", "cf"),
Entry("Spring data - for required secret collections", "p-dataflow", "1.6.6", "*.pivotal", "p-dataflow"),
// Entry("SRT - for broad coverage", "elastic-runtime", "6.0.5+LTS-T", "*srt*", "elastic-runtime"),
Entry("Spring data - for required secret collections", "p-dataflow", "1.14.2", "*.pivotal", "p-dataflow"),
)
})
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
custom_buildpack: java_buildpack_offline
dataflow_db_plan: db-small
dataflow_db_service: p.mysql
dataflow_disable_public_internet: false
dataflow_messaging_plan: single-node
dataflow_messaging_service: p.rabbitmq
p_dataflow_enable_global_access_to_plans: true
skipper_db_plan: db-small
skipper_db_service: p.mysql
timeout: 60
wavefront_source_prefix: dataflow-
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
create-uaa-client_post_deploy_state: default
delete-all_pre_delete_state: default
deploy-all_post_deploy_state: default
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- type: replace
path: /network-properties/other_availability_zones/0:after
value:
name: ((az2_name))
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- type: replace
path: /network-properties/other_availability_zones/0:after
value:
name: ((az2_name))
- type: replace
path: /network-properties/other_availability_zones/1:after
value:
name: ((az3_name))
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
- type: replace
path: /product-properties/.properties.maven_repositories?
value:
value:
- key: ((maven_repositories_0_key))
password:
secret: ((maven_repositories_0_password))
url: ((maven_repositories_0_url))
username: ((maven_repositories_0_username))
- key: ((maven_repositories_1_key))
password:
secret: ((maven_repositories_1_password))
url: ((maven_repositories_1_url))
username: ((maven_repositories_1_username))
- key: ((maven_repositories_2_key))
password:
secret: ((maven_repositories_2_password))
url: ((maven_repositories_2_url))
username: ((maven_repositories_2_username))
- key: ((maven_repositories_3_key))
password:
secret: ((maven_repositories_3_password))
url: ((maven_repositories_3_url))
username: ((maven_repositories_3_username))
- key: ((maven_repositories_4_key))
password:
secret: ((maven_repositories_4_password))
url: ((maven_repositories_4_url))
username: ((maven_repositories_4_username))
- key: ((maven_repositories_5_key))
password:
secret: ((maven_repositories_5_password))
url: ((maven_repositories_5_url))
username: ((maven_repositories_5_username))
- key: ((maven_repositories_6_key))
password:
secret: ((maven_repositories_6_password))
url: ((maven_repositories_6_url))
username: ((maven_repositories_6_username))
- key: ((maven_repositories_7_key))
password:
secret: ((maven_repositories_7_password))
url: ((maven_repositories_7_url))
username: ((maven_repositories_7_username))
- key: ((maven_repositories_8_key))
password:
secret: ((maven_repositories_8_password))
url: ((maven_repositories_8_url))
username: ((maven_repositories_8_username))
- key: ((maven_repositories_9_key))
password:
secret: ((maven_repositories_9_password))
url: ((maven_repositories_9_url))
username: ((maven_repositories_9_username))
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
- type: replace
path: /product-properties/.properties.maven_repositories?
value:
value:
- key: ((maven_repositories_0_key))
password:
secret: ((maven_repositories_0_password))
url: ((maven_repositories_0_url))
username: ((maven_repositories_0_username))
- key: ((maven_repositories_1_key))
password:
secret: ((maven_repositories_1_password))
url: ((maven_repositories_1_url))
username: ((maven_repositories_1_username))
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- type: replace
path: /product-properties/.properties.maven_repositories?
value:
value:
- key: ((maven_repositories_0_key))
password:
secret: ((maven_repositories_0_password))
url: ((maven_repositories_0_url))
username: ((maven_repositories_0_username))
- key: ((maven_repositories_1_key))
password:
secret: ((maven_repositories_1_password))
url: ((maven_repositories_1_url))
username: ((maven_repositories_1_username))
- key: ((maven_repositories_2_key))
password:
secret: ((maven_repositories_2_password))
url: ((maven_repositories_2_url))
username: ((maven_repositories_2_username))
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
- type: replace
path: /product-properties/.properties.maven_repositories?
value:
value:
- key: ((maven_repositories_0_key))
password:
secret: ((maven_repositories_0_password))
url: ((maven_repositories_0_url))
username: ((maven_repositories_0_username))
- key: ((maven_repositories_1_key))
password:
secret: ((maven_repositories_1_password))
url: ((maven_repositories_1_url))
username: ((maven_repositories_1_username))
- key: ((maven_repositories_2_key))
password:
secret: ((maven_repositories_2_password))
url: ((maven_repositories_2_url))
username: ((maven_repositories_2_username))
- key: ((maven_repositories_3_key))
password:
secret: ((maven_repositories_3_password))
url: ((maven_repositories_3_url))
username: ((maven_repositories_3_username))
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
- type: replace
path: /product-properties/.properties.maven_repositories?
value:
value:
- key: ((maven_repositories_0_key))
password:
secret: ((maven_repositories_0_password))
url: ((maven_repositories_0_url))
username: ((maven_repositories_0_username))
- key: ((maven_repositories_1_key))
password:
secret: ((maven_repositories_1_password))
url: ((maven_repositories_1_url))
username: ((maven_repositories_1_username))
- key: ((maven_repositories_2_key))
password:
secret: ((maven_repositories_2_password))
url: ((maven_repositories_2_url))
username: ((maven_repositories_2_username))
- key: ((maven_repositories_3_key))
password:
secret: ((maven_repositories_3_password))
url: ((maven_repositories_3_url))
username: ((maven_repositories_3_username))
- key: ((maven_repositories_4_key))
password:
secret: ((maven_repositories_4_password))
url: ((maven_repositories_4_url))
username: ((maven_repositories_4_username))
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
- type: replace
path: /product-properties/.properties.maven_repositories?
value:
value:
- key: ((maven_repositories_0_key))
password:
secret: ((maven_repositories_0_password))
url: ((maven_repositories_0_url))
username: ((maven_repositories_0_username))
- key: ((maven_repositories_1_key))
password:
secret: ((maven_repositories_1_password))
url: ((maven_repositories_1_url))
username: ((maven_repositories_1_username))
- key: ((maven_repositories_2_key))
password:
secret: ((maven_repositories_2_password))
url: ((maven_repositories_2_url))
username: ((maven_repositories_2_username))
- key: ((maven_repositories_3_key))
password:
secret: ((maven_repositories_3_password))
url: ((maven_repositories_3_url))
username: ((maven_repositories_3_username))
- key: ((maven_repositories_4_key))
password:
secret: ((maven_repositories_4_password))
url: ((maven_repositories_4_url))
username: ((maven_repositories_4_username))
- key: ((maven_repositories_5_key))
password:
secret: ((maven_repositories_5_password))
url: ((maven_repositories_5_url))
username: ((maven_repositories_5_username))
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
- type: replace
path: /product-properties/.properties.maven_repositories?
value:
value:
- key: ((maven_repositories_0_key))
password:
secret: ((maven_repositories_0_password))
url: ((maven_repositories_0_url))
username: ((maven_repositories_0_username))
- key: ((maven_repositories_1_key))
password:
secret: ((maven_repositories_1_password))
url: ((maven_repositories_1_url))
username: ((maven_repositories_1_username))
- key: ((maven_repositories_2_key))
password:
secret: ((maven_repositories_2_password))
url: ((maven_repositories_2_url))
username: ((maven_repositories_2_username))
- key: ((maven_repositories_3_key))
password:
secret: ((maven_repositories_3_password))
url: ((maven_repositories_3_url))
username: ((maven_repositories_3_username))
- key: ((maven_repositories_4_key))
password:
secret: ((maven_repositories_4_password))
url: ((maven_repositories_4_url))
username: ((maven_repositories_4_username))
- key: ((maven_repositories_5_key))
password:
secret: ((maven_repositories_5_password))
url: ((maven_repositories_5_url))
username: ((maven_repositories_5_username))
- key: ((maven_repositories_6_key))
password:
secret: ((maven_repositories_6_password))
url: ((maven_repositories_6_url))
username: ((maven_repositories_6_username))
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
- type: replace
path: /product-properties/.properties.maven_repositories?
value:
value:
- key: ((maven_repositories_0_key))
password:
secret: ((maven_repositories_0_password))
url: ((maven_repositories_0_url))
username: ((maven_repositories_0_username))
- key: ((maven_repositories_1_key))
password:
secret: ((maven_repositories_1_password))
url: ((maven_repositories_1_url))
username: ((maven_repositories_1_username))
- key: ((maven_repositories_2_key))
password:
secret: ((maven_repositories_2_password))
url: ((maven_repositories_2_url))
username: ((maven_repositories_2_username))
- key: ((maven_repositories_3_key))
password:
secret: ((maven_repositories_3_password))
url: ((maven_repositories_3_url))
username: ((maven_repositories_3_username))
- key: ((maven_repositories_4_key))
password:
secret: ((maven_repositories_4_password))
url: ((maven_repositories_4_url))
username: ((maven_repositories_4_username))
- key: ((maven_repositories_5_key))
password:
secret: ((maven_repositories_5_password))
url: ((maven_repositories_5_url))
username: ((maven_repositories_5_username))
- key: ((maven_repositories_6_key))
password:
secret: ((maven_repositories_6_password))
url: ((maven_repositories_6_url))
username: ((maven_repositories_6_username))
- key: ((maven_repositories_7_key))
password:
secret: ((maven_repositories_7_password))
url: ((maven_repositories_7_url))
username: ((maven_repositories_7_username))
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
- type: replace
path: /product-properties/.properties.maven_repositories?
value:
value:
- key: ((maven_repositories_0_key))
password:
secret: ((maven_repositories_0_password))
url: ((maven_repositories_0_url))
username: ((maven_repositories_0_username))
- key: ((maven_repositories_1_key))
password:
secret: ((maven_repositories_1_password))
url: ((maven_repositories_1_url))
username: ((maven_repositories_1_username))
- key: ((maven_repositories_2_key))
password:
secret: ((maven_repositories_2_password))
url: ((maven_repositories_2_url))
username: ((maven_repositories_2_username))
- key: ((maven_repositories_3_key))
password:
secret: ((maven_repositories_3_password))
url: ((maven_repositories_3_url))
username: ((maven_repositories_3_username))
- key: ((maven_repositories_4_key))
password:
secret: ((maven_repositories_4_password))
url: ((maven_repositories_4_url))
username: ((maven_repositories_4_username))
- key: ((maven_repositories_5_key))
password:
secret: ((maven_repositories_5_password))
url: ((maven_repositories_5_url))
username: ((maven_repositories_5_username))
- key: ((maven_repositories_6_key))
password:
secret: ((maven_repositories_6_password))
url: ((maven_repositories_6_url))
username: ((maven_repositories_6_username))
- key: ((maven_repositories_7_key))
password:
secret: ((maven_repositories_7_password))
url: ((maven_repositories_7_url))
username: ((maven_repositories_7_username))
- key: ((maven_repositories_8_key))
password:
secret: ((maven_repositories_8_password))
url: ((maven_repositories_8_url))
username: ((maven_repositories_8_username))
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- type: replace
path: /product-properties/.properties.composed_task_runner_uri?
value:
value: ((composed_task_runner_uri))
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- type: replace
path: /product-properties/.properties.security_groups?
value:
value: ((security_groups))
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- type: replace
path: /product-properties/.properties.wavefront_key?
value:
value: ((wavefront_key))
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- type: replace
path: /product-properties/.properties.wavefront_uri?
value:
value: ((wavefront_uri))
Loading

0 comments on commit bdd1269

Please sign in to comment.