Skip to content

Commit a6de02b

Browse files
authored
[deployment] Move list of services that use platform scaffolding out of deployment-service code into package.meta files. (#1126)
* Use package metadata to say whether a package uses platform scaffolding. Fixes #1040. Signed-off-by: Yvonne Lam <[email protected]> * Regenerate bindata. Signed-off-by: Yvonne Lam <[email protected]> * Stop carrying around data unnecessarily. Signed-off-by: Yvonne Lam <[email protected]>
1 parent 279e78c commit a6de02b

File tree

20 files changed

+182
-32
lines changed

20 files changed

+182
-32
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "chef/applications-service",
3+
"uses_platform_scaffolding": true
4+
}

components/authn-service/package.meta

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "chef/authn-service",
3+
"uses_platform_scaffolding": true
4+
}

components/authz-service/package.meta

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "chef/authz-service",
3+
"uses_platform_scaffolding": true
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "chef/automate-cs-bookshelf",
3+
"uses_platform_scaffolding": true
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "chef/automate-cs-oc-bifrost",
3+
"uses_platform_scaffolding": true
4+
}

components/automate-cs-oc-erchef/package.meta

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@
2121
"type": "file",
2222
"path": "data/dark_launch_features.json"
2323
}
24-
]
24+
],
25+
"uses_platform_scaffolding": true
2526
}

components/automate-deployment/pkg/assets/assets.bindata.go

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/automate-deployment/pkg/server/server.go

+3-8
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,7 @@ func (s *server) configRenderer() (ConfigRenderer, error) {
411411
logrus.WithError(err).Error("Could not render platform config")
412412
return nil, errors.Wrap(err, "Could not render platform config")
413413
}
414+
414415
return func(service *deployment.Service) (string, error) {
415416
rootCert := s.deployment.CA().RootCert()
416417
creds := &config.TLSCredentials{
@@ -446,14 +447,8 @@ func (s *server) configRenderer() (ConfigRenderer, error) {
446447
}
447448

448449
func usesPlatformScaffolding(service *deployment.Service) bool {
449-
//TODO (jaym): find a better way to get this information
450-
switch service.Name() {
451-
case "secrets-service", "pg-sidecar-service", "teams-service", "authz-service", "session-service", "automate-dex",
452-
"authn-service", "compliance-service", "nodemanager-service", "notifications-service", "applications-service",
453-
"automate-cs-bookshelf", "automate-cs-oc-erchef", "automate-cs-oc-bifrost", "ingest-service", "license-control-service":
454-
return true
455-
}
456-
return false
450+
metadata := services.MetadataForPackage(service.Name())
451+
return metadata != nil && metadata.UsesPlatformScaffolding
457452
}
458453

459454
func (s *errDeployer) convergeServices(task *converge.Task, eventSink converge.EventSink) {

components/automate-deployment/pkg/services/internal/generated/gen.go

+107-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/automate-dex/package.meta

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "chef/automate-dex",
3+
"uses_platform_scaffolding": true
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "chef/compliance-service",
3+
"uses_platform_scaffolding": true
4+
}
+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "chef/ingest-service",
3+
"uses_platform_scaffolding": true
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "chef/license-control-service",
3+
"uses_platform_scaffolding": true
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "chef/nodemanager-service",
3+
"uses_platform_scaffolding": true
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "chef/notifications-service",
3+
"uses_platform_scaffolding": true
4+
}

0 commit comments

Comments
 (0)