Skip to content

Commit

Permalink
Revert "Enable current configuration load (#1595)" (#1599)
Browse files Browse the repository at this point in the history 
This reverts commit 3264bc9.
  • Loading branch information
@KsaweryZietara
KsaweryZietara authored Dec 27, 2024
1 parent 9fb094e commit f28d608
Show file tree
Hide file tree
Showing 52 changed files with 3 additions and 57 deletions.
9 changes: 3 additions & 6 deletions internal/broker/plans_schema.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ type RootSchema struct {
ShowFormView bool `json:"_show_form_view"`
// Specifies in what order properties will be displayed on the form
ControlsOrder []string `json:"_controlsOrder"`
// Specified to true loads current instance configuration into the update instance schema
LoadCurrentConfig bool `json:"_load_current_config"`
}

type ProvisioningProperties struct {
Expand Down Expand Up @@ -364,10 +362,9 @@ func NewSchema(properties interface{}, update bool, required []string) *RootSche
Type: Type{
Type: "object",
},
Properties: properties,
ShowFormView: true,
Required: required,
LoadCurrentConfig: true,
Properties: properties,
ShowFormView: true,
Required: required,
}

if update {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/aws/aws-schema-additional-params-eu.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/aws/aws-schema-additional-params.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/aws/aws-schema-eu.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"modules",
"networking"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"autoScalerMax": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/aws/aws-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"modules",
"networking"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"autoScalerMax": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/aws/free-aws-schema-additional-params-eu.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/aws/free-aws-schema-additional-params.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/aws/free-aws-schema-eu.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"modules",
"networking"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"modules": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/aws/free-aws-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"modules",
"networking"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"modules": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/aws/update-aws-schema-additional-params.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/aws/update-aws-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"autoScalerMin",
"autoScalerMax"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"autoScalerMax": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/aws/update-free-aws-schema-additional-params.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/azure-lite-schema-additional-params-eu-reduced.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/azure-lite-schema-additional-params-eu.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/azure-lite-schema-additional-params-reduced.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/azure-lite-schema-additional-params.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/azure-lite-schema-eu-reduced.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"modules",
"networking"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"autoScalerMax": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/azure-lite-schema-eu.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"modules",
"networking"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"autoScalerMax": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/azure-lite-schema-reduced.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"modules",
"networking"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"autoScalerMax": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/azure-lite-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"modules",
"networking"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"autoScalerMax": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/azure-schema-additional-params-eu.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/azure-schema-additional-params.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/azure-schema-eu.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"modules",
"networking"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"autoScalerMax": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/azure-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"modules",
"networking"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"autoScalerMax": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/azure-trial-schema-additional-params.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/azure-trial-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"name",
"modules"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"modules": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/free-azure-schema-additional-params-eu.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/free-azure-schema-additional-params.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/free-azure-schema-eu.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"modules",
"networking"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"modules": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/free-azure-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"modules",
"networking"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"modules": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/update-azure-lite-schema-additional-params-reduced.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/update-azure-lite-schema-additional-params.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/update-azure-lite-schema-reduced.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"autoScalerMin",
"autoScalerMax"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"autoScalerMax": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/update-azure-lite-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"autoScalerMin",
"autoScalerMax"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"autoScalerMax": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/update-azure-schema-additional-params.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/update-azure-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"autoScalerMin",
"autoScalerMax"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"autoScalerMax": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/update-azure-trial-schema-additional-params.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/azure/update-free-azure-schema-additional-params.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/gcp/gcp-schema-additional-params-assured-workloads.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/gcp/gcp-schema-additional-params.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/gcp/gcp-schema-assured-workloads.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"modules",
"networking"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"autoScalerMax": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/gcp/gcp-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"modules",
"networking"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"autoScalerMax": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/gcp/update-gcp-schema-additional-params.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/gcp/update-gcp-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"autoScalerMin",
"autoScalerMax"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"autoScalerMax": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/own-cluster-schema-additional-params.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"shootDomain",
"modules"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"kubeconfig": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/own-cluster-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"shootDomain",
"modules"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"kubeconfig": {
Expand Down
1 change: 0 additions & 1 deletion ...nal/broker/testdata/sap-converged-cloud/sap-converged-cloud-schema-additional-params.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"oidc",
"administrators"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"administrators": {
Expand Down
1 change: 0 additions & 1 deletion internal/broker/testdata/sap-converged-cloud/sap-converged-cloud-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"modules",
"networking"
],
"_load_current_config": true,
"_show_form_view": true,
"properties": {
"autoScalerMax": {
Expand Down
Loading

0 comments on commit f28d608

Please sign in to comment.