diff --git a/jobs/golangapiserver/templates/apiserver.yml.erb b/jobs/golangapiserver/templates/apiserver.yml.erb index 4dd34c3312..94ea262445 100644 --- a/jobs/golangapiserver/templates/apiserver.yml.erb +++ b/jobs/golangapiserver/templates/apiserver.yml.erb @@ -86,7 +86,7 @@ broker_credentials: catalog_path: /var/vcap/jobs/golangapiserver/config/catalog.json catalog_schema_path: /var/vcap/packages/golangapiserver/catalog.schema.json info_file_path: /var/vcap/jobs/golangapiserver/config/info.json -policy_schema_path: /var/vcap/packages/golangapiserver/meta.schema.json +policy_schema_path: /var/vcap/packages/golangapiserver/json-schema/meta.schema.json dashboard_redirect_uri: <%= p("autoscaler.apiserver.broker.server.dashboard_redirect_uri") %> default_credential_type: <%= p("autoscaler.apiserver.broker.default_credential_type") %> diff --git a/packages/golangapiserver/packaging b/packages/golangapiserver/packaging index 77e97c536b..86c3b3ec4c 100644 --- a/packages/golangapiserver/packaging +++ b/packages/golangapiserver/packaging @@ -13,5 +13,5 @@ cp --archive "${BOSH_COMPILE_TARGET}/autoscaler/build/api" "${BOSH_INSTALL_TARGE cp --archive "${BOSH_COMPILE_TARGET}/autoscaler/api/db/api.db.changelog.yml" "${BOSH_INSTALL_TARGET}" cp --archive "${BOSH_COMPILE_TARGET}/autoscaler/api/db/servicebroker.db.changelog.yaml" "${BOSH_INSTALL_TARGET}" -cp --archive "${BOSH_COMPILE_TARGET}"/autoscaler/api/policyvalidator/*.json "${BOSH_INSTALL_TARGET}" +cp --archive "${BOSH_COMPILE_TARGET}"/autoscaler/api/policyvalidator/json-schema "${BOSH_INSTALL_TARGET}" cp --archive "${BOSH_COMPILE_TARGET}/autoscaler/api/schemas/catalog.schema.json" "${BOSH_INSTALL_TARGET}" diff --git a/packages/golangapiserver/spec b/packages/golangapiserver/spec index c086e5d062..faceaee15a 100644 --- a/packages/golangapiserver/spec +++ b/packages/golangapiserver/spec @@ -10,6 +10,7 @@ files: - autoscaler/api/db/* - autoscaler/api/policyvalidator/* - autoscaler/api/schemas/* +- autoscaler/api/policyvalidator/json-schema/** # json-schemas - autoscaler/api/* # gosub - autoscaler/api/apis/* # gosub - autoscaler/api/apis/scalinghistory/* # gosub diff --git a/schema/json/Readme.md b/schema/json/Readme.md deleted file mode 100644 index 3e694c9c1b..0000000000 --- a/schema/json/Readme.md +++ /dev/null @@ -1,7 +0,0 @@ -# Read-me # - -The currently used golang-library for json-schema, namely “[gojsonschema]()” not seems to be capable to resolve references to other files correctly across different directories. Perhaps not limited to but especially when referencing up the file-system-hierarchy (parent-directories). In theory, symbolic links can be used to circumvent the issue … if there would not be another weakness in which we currently use in the workflow [bosh-release-checks.yaml](<../../../../.github/workflows/bosh-release-checks.yaml>) for making a compiled release: It can not handle symbolic links. Therefore it gets hard-linked here (which can not be tracked by git but it can somehow handle it!). - -After phasing out the bosh-technology of “Application Autoscaler”, these hardlinks can be removed. - -⚠️ This means the consinstence needs to be ensured manually. There is no CI/CD-check because Bosh is already in its phase-out for “Application Autoscaler”. diff --git a/schema/json/legacy.schema.json b/schema/json/legacy.schema.json deleted file mode 120000 index 645e3923a9..0000000000 --- a/schema/json/legacy.schema.json +++ /dev/null @@ -1 +0,0 @@ -../../src/autoscaler/api/policyvalidator/legacy.schema.json \ No newline at end of file diff --git a/schema/json/meta.schema.json b/schema/json/meta.schema.json deleted file mode 120000 index e05716cffd..0000000000 --- a/schema/json/meta.schema.json +++ /dev/null @@ -1 +0,0 @@ -../../src/autoscaler/api/policyvalidator/meta.schema.json \ No newline at end of file diff --git a/schema/json/policy-configuration.schema.json b/schema/json/policy-configuration.schema.json deleted file mode 120000 index b6d92a07a6..0000000000 --- a/schema/json/policy-configuration.schema.json +++ /dev/null @@ -1 +0,0 @@ -../../src/autoscaler/api/policyvalidator/policy-configuration.schema.json \ No newline at end of file diff --git a/schema/json/scaling-policy.v0_9.schema.json b/schema/json/scaling-policy.v0_9.schema.json deleted file mode 120000 index 583ce9934d..0000000000 --- a/schema/json/scaling-policy.v0_9.schema.json +++ /dev/null @@ -1 +0,0 @@ -../../src/autoscaler/api/policyvalidator/scaling-policy.v0_9.schema.json \ No newline at end of file diff --git a/schema/json/service-key_only.v0_9.schema.json b/schema/json/service-key_only.v0_9.schema.json deleted file mode 120000 index 0f5e1dabb4..0000000000 --- a/schema/json/service-key_only.v0_9.schema.json +++ /dev/null @@ -1 +0,0 @@ -../../src/autoscaler/api/policyvalidator/service-key_only.v0_9.schema.json \ No newline at end of file diff --git a/schema/json/shared_definitions.json b/schema/json/shared_definitions.json deleted file mode 120000 index 01a37df394..0000000000 --- a/schema/json/shared_definitions.json +++ /dev/null @@ -1 +0,0 @@ -../../src/autoscaler/api/policyvalidator/shared_definitions.json \ No newline at end of file