ROX-28506: Rename dinosaur to central Part 1 (#2291)

* Rename Dinosaur to Central

* Replace centrals_mgmt with rhacs

Author: kurlov

.gitattributes

@@ -1 +1 @@
-internal/dinosaur/pkg/api/admin/private/api/openapi.yaml linguist-generated
+internal/central/pkg/api/admin/private/api/openapi.yaml linguist-generated

.github/workflows/multicluster-e2e.yaml

@@ -10,8 +10,8 @@ on:
       - '.github/workflows/multicluster-e2e.yaml'
       - 'scripts/ci/**'
       - 'scripts/lib/**'
-      - 'internal/pkg/handlers/admin_dinosaur.go'
-      - 'internal/dinosaur/pkg/services/dinosaur.go'
+      - 'internal/central/pkg/handlers/admin_central.go'
+      - 'internal/central/pkg/services/central.go'
 
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
@@ -21,8 +21,8 @@ on:
       - '.github/workflows/multicluster-e2e.yaml'
       - 'scripts/ci/**'
       - 'scripts/lib/**'
-      - 'internal/pkg/handlers/admin_dinosaur.go'
-      - 'internal/dinosaur/pkg/services/dinosaur.go'
+      - 'internal/central/pkg/handlers/admin_central.go'
+      - 'internal/central/pkg/services/central.go'
 
 jobs:
   create-cluster:

.github/workflows/openapi_update.yaml

@@ -35,4 +35,4 @@ jobs:
           token: ${{ env.APP_SERVICES_CI_TOKEN }}
           repository: ${{ matrix.repo }}
           event-type: openapi-spec-change
-          client-payload: '{ "id": "dinosaur-mgmt/v1", "download_url":"https://raw.githubusercontent.com/stackrox/acs-fleet-manager/main/openapi/fleet-manager.yaml"}' #TODO change the repository URL to match your fleet manager URL
+          client-payload: '{ "id": "central-mgmt/v1", "download_url":"https://raw.githubusercontent.com/stackrox/acs-fleet-manager/main/openapi/fleet-manager.yaml"}' #TODO change the repository URL to match your fleet manager URL

.gitignore

@@ -59,7 +59,7 @@ cmd/fleet-manager/fleet-manager
 !/secrets/db.user
 
 # cluster details (used for testing)
-/internal/dinosaur/test/integration/test_cluster.json
+/internal/central/test/integration/test_cluster.json
 
 # cluster configuration, overwritten locally to custom clusters
 config/dataplane-cluster-configuration.yaml

.golangci.yml

@@ -1,8 +1,8 @@
 run:
   skip-dirs:
-    - internal/dinosaur/pkg/api/public
-    - internal/dinosaur/pkg/api/private
-    - internal/dinosaur/pkg/api/admin/private
+    - internal/central/pkg/api/public
+    - internal/central/pkg/api/private
+    - internal/central/pkg/api/admin/private
     - pkg/client/redhatsso/api
     - emailsender/pkg/client/openapi
   skip-files:

.openapi-generator-ignore

@@ -22,21 +22,21 @@
 # Then explicitly reverse the ignore rule for a single file:
 #!docs/README.md
 
-internal/dinosaur/pkg/api/public/README.md
-internal/dinosaur/pkg/api/public/docs/**.md
-internal/dinosaur/pkg/api/public/**all_of.go
-internal/dinosaur/pkg/api/public/go.mod
-internal/dinosaur/pkg/api/public/go.sum
-internal/dinosaur/pkg/api/private/README.md
-internal/dinosaur/pkg/api/private/docs/**.md
-internal/dinosaur/pkg/api/private/**all_of.go
-internal/dinosaur/pkg/api/private/go.mod
-internal/dinosaur/pkg/api/private/go.sum
-internal/dinosaur/pkg/api/admin/private/README.md
-internal/dinosaur/pkg/api/admin/private/docs/**.md
-internal/dinosaur/pkg/api/admin/private/**all_of.go
-internal/dinosaur/pkg/api/admin/private/go.mod
-internal/dinosaur/pkg/api/admin/private/go.sum
+internal/central/pkg/api/public/README.md
+internal/central/pkg/api/public/docs/**.md
+internal/central/pkg/api/public/**all_of.go
+internal/central/pkg/api/public/go.mod
+internal/central/pkg/api/public/go.sum
+internal/central/pkg/api/private/README.md
+internal/central/pkg/api/private/docs/**.md
+internal/central/pkg/api/private/**all_of.go
+internal/central/pkg/api/private/go.mod
+internal/central/pkg/api/private/go.sum
+internal/central/pkg/api/admin/private/README.md
+internal/central/pkg/api/admin/private/docs/**.md
+internal/central/pkg/api/admin/private/**all_of.go
+internal/central/pkg/api/admin/private/go.mod
+internal/central/pkg/api/admin/private/go.sum
 pkg/client/redhatsso/api/README.md
 pkg/client/redhatsso/api/docs/**.md
 pkg/client/redhatsso/api/**all_of.go

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
       require_serial: true
       pass_filenames: true
       stages: [pre-push, manual]
-      files: '(openapi/.*|pkg/workers/worker_interface.go|pkg/client/ocm/id.go|pkg/client/aws/client.go|pkg/client/ocm/client.go|pkg/client/iam/client.go|pkg/services/authorization/authorization.go|pkg/services/sso/iam_service.go|pkg/client/redhatsso/client.go|pkg/auth/auth_agent_service.go|internal/dinosaur/pkg/services/cluster_placement_strategy.go|internal/dinosaur/pkg/services/cloud_providers.go|internal/dinosaur/pkg/services/clusters.go|internal/dinosaur/pkg/services/quota.go|internal/dinosaur/pkg/services/fleetshard_operator_addon.go|internal/dinosaur/pkg/services/quota_service_factory.go|internal/dinosaur/pkg/clusters/cluster_builder.go|internal/dinosaur/pkg/clusters/provider.go|internal/dinosaur/pkg/services/dinosaur.go)'
+      files: '(openapi/.*|pkg/workers/worker_interface.go|pkg/client/ocm/id.go|pkg/client/aws/client.go|pkg/client/ocm/client.go|pkg/client/iam/client.go|pkg/services/authorization/authorization.go|pkg/services/sso/iam_service.go|pkg/client/redhatsso/client.go|pkg/auth/auth_agent_service.go|internal/central/pkg/services/cluster_placement_strategy.go|internal/central/pkg/services/cloud_providers.go|internal/central/pkg/services/clusters.go|internal/central/pkg/services/quota.go|internal/central/pkg/services/fleetshard_operator_addon.go|internal/central/pkg/services/quota_service_factory.go|internal/central/pkg/clusters/cluster_builder.go|internal/central/pkg/clusters/provider.go|internal/central/pkg/services/central.go)'
   - repo: https://github.com/Yelp/detect-secrets
     rev: v1.5.0
     hooks:
@@ -24,14 +24,14 @@ repos:
       - id: trailing-whitespace
         args: ["--markdown-linebreak-ext=md"]
       - id: end-of-file-fixer
-        exclude: '^(?:secrets/db.*|internal/dinosaur/pkg/api/(admin|private|public)/.*|pkg/client/redhatsso/api/.*|emailsender/pkg/client/openapi/.*)$' # Matches either secrets/db.* files or the generated files under internal/dinosaur/pkg/api/(admin|private|public) and pkg/client/redhatsso/client/api.
+        exclude: '^(?:secrets/db.*|internal/central/pkg/api/(admin|private|public)/.*|pkg/client/redhatsso/api/.*|emailsender/pkg/client/openapi/.*)$' # Matches either secrets/db.* files or the generated files under internal/central/pkg/api/(admin|private|public) and pkg/client/redhatsso/client/api.
       - id: check-json
   - repo: https://github.com/shellcheck-py/shellcheck-py
     rev: v0.9.0.5
     hooks:
       - id: shellcheck
         # Ignore scripts generated by openapi-generator.
-        exclude: '^(?:internal/dinosaur/pkg/api/.*|pkg/client/redhatsso/api/.*|emailsender/pkg/client/openapi/.*)$'
+        exclude: '^(?:internal/central/pkg/api/.*|pkg/client/redhatsso/api/.*|emailsender/pkg/client/openapi/.*)$'
   - repo: local
     hooks:
       - id: code/check

.secrets.baseline

@@ -262,35 +262,35 @@
         "line_number": 289
       }
     ],
-    "internal/dinosaur/pkg/api/public/api/openapi.yaml": [
+    "internal/central/pkg/api/public/api/openapi.yaml": [
       {
         "type": "Base64 High Entropy String",
-        "filename": "internal/dinosaur/pkg/api/public/api/openapi.yaml",
+        "filename": "internal/central/pkg/api/public/api/openapi.yaml",
         "hashed_secret": "5b455797b93de5b6a19633ba22127c8a610f5c1b",
         "is_verified": false,
         "line_number": 1343
       }
     ],
-    "internal/dinosaur/pkg/presenters/managedcentral.go": [
+    "internal/central/pkg/presenters/managedcentral.go": [
       {
         "type": "Secret Keyword",
-        "filename": "internal/dinosaur/pkg/presenters/managedcentral.go",
+        "filename": "internal/central/pkg/presenters/managedcentral.go",
         "hashed_secret": "f4ac636d63edfd5477df8f25e4f4794c73e91d51",
         "is_verified": false,
         "line_number": 206
       },
       {
         "type": "Secret Keyword",
-        "filename": "internal/dinosaur/pkg/presenters/managedcentral.go",
+        "filename": "internal/central/pkg/presenters/managedcentral.go",
         "hashed_secret": "e26735ec1cbf8ad15cb7d1eea4893035f61297aa",
         "is_verified": false,
         "line_number": 212
       }
     ],
-    "internal/dinosaur/pkg/services/dinosaurservice_moq.go": [
+    "internal/central/pkg/services/centralservice_moq.go": [
       {
         "type": "Secret Keyword",
-        "filename": "internal/dinosaur/pkg/services/dinosaurservice_moq.go",
+        "filename": "internal/central/pkg/services/centralservice_moq.go",
         "hashed_secret": "44e17306b837162269a410204daaa5ecee4ec22c",
         "is_verified": false,
         "line_number": 1112

CONTRIBUTING.md

@@ -10,11 +10,6 @@
 
 ## Specialities
 
-### Dinosaurs
-
-The `dinosaur` is a placeholder for the service name. It originated from the [fleet-manager template](https://github.com/bf2fc6cc711aee1a0c2a/ffm-fleet-manager-go-template).
-Long-term all `dinosaur` occurrences will be replaced with our product name.
-
 ### Go package structure
 
 Project source is to be found under `$GOPATH/src` by a distinct directory path.
@@ -23,8 +18,8 @@ Project source is to be found under `$GOPATH/src` by a distinct directory path.
 /cmd
   /fleet-manager  -- Main CLI entrypoint
 /internal   -- service specific implementations
-   /dinosaur -- should be renamed to central
-       providers.go -- dinosaurs service injection setup
+   /central -- represents ACS Central component (central, external central-db, scanner, scanner-db)
+       providers.go -- centrals service injection setup
       /test  -- integration test folder
       /internal
         /services -- central services

Makefile

@@ -329,17 +329,17 @@ test/aws: $(GOTESTSUM_BIN)
 #   make test/integration TESTFLAGS="-run TestAccounts"     acts as TestAccounts* and run TestAccountsGet, TestAccountsPost, etc.
 #   make test/integration TESTFLAGS="-run TestAccountsGet"  runs TestAccountsGet
 #   make test/integration TESTFLAGS="-short"                skips long-run tests
-test/integration/dinosaur: $(GOTESTSUM_BIN)
+test/integration/central: $(GOTESTSUM_BIN)
 	OCM_ENV=integration $(GOTESTSUM_BIN) --junitfile data/results/fleet-manager-integration-tests.xml --format $(GOTESTSUM_FORMAT) -- -p 1 -ldflags -s -v -timeout $(TEST_TIMEOUT) -count=1 $(TESTFLAGS) \
-				./internal/dinosaur/test/integration/...
-.PHONY: test/integration/dinosaur
+				./internal/central/test/integration/...
+.PHONY: test/integration/central
 
 test/dp-terraform: $(GOTESTSUM_BIN)
 	$(GOTESTSUM_BIN) --format $(GOTESTSUM_FORMAT) -- -p 1 -ldflags -s -v -timeout $(TEST_TIMEOUT) -count=1 $(TESTFLAGS) \
 				./dp-terraform/test/...
 .PHONY: test/dp-terraform
 
-test/integration: test/integration/dinosaur test/dp-terraform
+test/integration: test/integration/central test/dp-terraform
 .PHONY: test/integration
 
 # remove OSD cluster after running tests against real OCM
@@ -417,24 +417,24 @@ openapi/generate: openapi/generate/public openapi/generate/private openapi/gener
 .PHONY: openapi/generate
 
 openapi/generate/public: openapi-generator
-	rm -rf internal/dinosaur/pkg/api/public
+	rm -rf internal/central/pkg/api/public
 	$(OPENAPI_GENERATOR) validate -i openapi/fleet-manager.yaml
-	$(OPENAPI_GENERATOR) generate -i openapi/fleet-manager.yaml -g go -o internal/dinosaur/pkg/api/public --package-name public -t openapi/templates --ignore-file-override ./.openapi-generator-ignore
-	$(GOFMT) -w internal/dinosaur/pkg/api/public
+	$(OPENAPI_GENERATOR) generate -i openapi/fleet-manager.yaml -g go -o internal/central/pkg/api/public --package-name public -t openapi/templates --ignore-file-override ./.openapi-generator-ignore
+	$(GOFMT) -w internal/central/pkg/api/public
 .PHONY: openapi/generate/public
 
 openapi/generate/private: openapi-generator
-	rm -rf internal/dinosaur/pkg/api/private
+	rm -rf internal/central/pkg/api/private
 	$(OPENAPI_GENERATOR) validate -i openapi/fleet-manager-private.yaml
-	$(OPENAPI_GENERATOR) generate -i openapi/fleet-manager-private.yaml -g go -o internal/dinosaur/pkg/api/private --package-name private -t openapi/templates --ignore-file-override ./.openapi-generator-ignore
-	$(GOFMT) -w internal/dinosaur/pkg/api/private
+	$(OPENAPI_GENERATOR) generate -i openapi/fleet-manager-private.yaml -g go -o internal/central/pkg/api/private --package-name private -t openapi/templates --ignore-file-override ./.openapi-generator-ignore
+	$(GOFMT) -w internal/central/pkg/api/private
 .PHONY: openapi/generate/private
 
 openapi/generate/admin: openapi-generator
-	rm -rf internal/dinosaur/pkg/api/admin/private
+	rm -rf internal/central/pkg/api/admin/private
 	$(OPENAPI_GENERATOR) validate -i openapi/fleet-manager-private-admin.yaml
-	$(OPENAPI_GENERATOR) generate -i openapi/fleet-manager-private-admin.yaml -g go -o internal/dinosaur/pkg/api/admin/private --package-name private -t openapi/templates --ignore-file-override ./.openapi-generator-ignore
-	$(GOFMT) -w internal/dinosaur/pkg/api/admin/private
+	$(OPENAPI_GENERATOR) generate -i openapi/fleet-manager-private-admin.yaml -g go -o internal/central/pkg/api/admin/private --package-name private -t openapi/templates --ignore-file-override ./.openapi-generator-ignore
+	$(GOFMT) -w internal/central/pkg/api/admin/private
 .PHONY: openapi/generate/admin
 
 openapi/generate/rhsso: openapi-generator

README.md

@@ -123,10 +123,8 @@ $ make db/migrate
 #### Background
 
 This project was started from a fleet-manager template with an example "Dinosaur" application as a managed service.
-Implementations which reference "Dinosaur" are replaced iteratively.
 
-For a real service written using the same fleet management pattern see the
-[kas-fleet-manager](https://github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager).
+Another fleet manager which was built from the same template [kas-fleet-manager](https://github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager).
 Original [fleet-manager template](https://github.com/bf2fc6cc711aee1a0c2a/ffm-fleet-manager-go-template).
 
 To contact the people that created this template go to [zulip](https://bf2.zulipchat.com/).

cmd/acsfleetctl/main.go

@@ -5,9 +5,9 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"github.com/stackrox/acs-fleet-manager/internal/dinosaur/pkg/cmd/admin"
-	"github.com/stackrox/acs-fleet-manager/internal/dinosaur/pkg/cmd/centrals"
-	gitopsCmd "github.com/stackrox/acs-fleet-manager/internal/dinosaur/pkg/gitops/cmd"
+	"github.com/stackrox/acs-fleet-manager/internal/central/pkg/cmd/admin"
+	"github.com/stackrox/acs-fleet-manager/internal/central/pkg/cmd/centrals"
+	gitopsCmd "github.com/stackrox/acs-fleet-manager/internal/central/pkg/gitops/cmd"
 )
 
 func main() {

cmd/fleet-manager/main.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
-	"github.com/stackrox/acs-fleet-manager/internal/dinosaur"
+	"github.com/stackrox/acs-fleet-manager/internal/central"
 	"github.com/stackrox/acs-fleet-manager/pkg/environments"
 )
 
@@ -27,7 +27,7 @@ func main() {
 	}
 
 	env, err := environments.New(environments.GetEnvironmentStrFromEnv(),
-		dinosaur.ConfigProviders(),
+		central.ConfigProviders(),
 	)
 	if err != nil {
 		glog.Fatalf("error initializing: %v", err)

cmd/fleet-manager/main_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/stackrox/acs-fleet-manager/pkg/workers"
 
 	. "github.com/onsi/gomega"
-	"github.com/stackrox/acs-fleet-manager/internal/dinosaur"
+	"github.com/stackrox/acs-fleet-manager/internal/central"
 	"github.com/stackrox/acs-fleet-manager/pkg/environments"
 	"github.com/stackrox/acs-fleet-manager/pkg/serviceregistration"
 )
@@ -21,7 +21,7 @@ func TestInjections(t *testing.T) {
 	RegisterTestingT(t)
 
 	env, err := environments.New(environments.DevelopmentEnv,
-		dinosaur.ConfigProviders(),
+		central.ConfigProviders(),
 	)
 
 	// Puts non-empty central IdP client secret value so config validation does not fail.

config/dataplane-cluster-configuration.yaml

@@ -12,9 +12,9 @@
 #    region: us-east-1
 #    multi_az: true
 #    schedulable: true
-#    dinosaur_instance_limit: 2
+#    central_instance_limit: 2
 #    status: "cluster_provisioning" #Valid values are `cluster_provisioning`, `cluster_provisioned` and `ready`. `cluster_provisioning` will be used if not specified.
 #    provider_type: "ocm" #Valid values are `ocm` and `standalone`. `ocm` will be used if not specified.
-#    cluster_dns: apps.example.com #Valid cluster DNS. This will be used to build dinosaur host url and to communicate with standalone clusters. Required when "provider_type" is "standalone"
+#    cluster_dns: apps.example.com #Valid cluster DNS. This will be used to build central host url and to communicate with standalone clusters. Required when "provider_type" is "standalone"
 #    supported_instance_type: "eval" # could be "eval", "standard" or both i.e "standard,eval" or "eval,standard". Defaults to "standard,eval" if not set
 clusters: []  # For a list of development clusters see dev/config/dataplane-cluster-configuration.yaml

config/quota-management-list-configuration.yaml

@@ -1,6 +1,6 @@
 ---
 # A list of registered users given by their usernames irrespective whether they are under an organisation or not.
-# If a user is not in this or in the `registered_users_per_organisation` list, only EVAL dinosaur instances will be allowed.
+# If a user is not in this or in the `registered_users_per_organisation` list, only EVAL Central instances will be allowed.
 # For now, this only supports RH service account.
 # In the future it may support service accounts outside RH.
 # The structure of registered service accounts is:
@@ -16,9 +16,9 @@ registered_service_accounts:
     max_allowed_instances: 1
 
 # A list of registered users per organisation (see structure below). The list current contains known organisations - add yours if it is missing.
-# If a user is not in this or in the `registered_service_accounts` list, only EVAL dinosaur instances will be allowed.
+# If a user is not in this or in the `registered_service_accounts` list, only EVAL Central instances will be allowed.
 # - "id": is the organisation id
-# - "any_user": "any_user": Controls whether to allow all users to create standard dinosaur instances with this organisation if "registered_users" list is empty.
+# - "any_user": "any_user": Controls whether to allow all users to create standard Central instances with this organisation if "registered_users" list is empty.
 # - max_allowed_instances: is the maximum number of instances this orgnisation. Defaults to the global value of `max-allowed-instances` which has different values for distinct environments.
 # - "registered_users": A list of registered users for this organisation. If empty, no one is registered unless "any_user" is set to true.
 #      - username: is the account of the user. The username must be unique within the organisation and across organisations.

dev/config/quota-management-list-configuration.yaml

@@ -1,6 +1,6 @@
 ---
 # A list of registered users given by their usernames irrespective whether they are under an organisation or not.
-# If a user is not in this or in the `registered_users_per_organisation` list, only EVAL dinosaur instances will be allowed.
+# If a user is not in this or in the `registered_users_per_organisation` list, only EVAL central instances will be allowed.
 # For now, this only supports RH service account.
 # In the future it may support service accounts outside RH.
 # The structure of registered service accounts is:
@@ -16,9 +16,9 @@ registered_service_accounts:
     max_allowed_instances: 1
 
 # A list of registered users per organisation (see structure below). The list current contains known organisations - add yours if it is missing.
-# If a user is not in this or in the `registered_service_accounts` list, only EVAL dinosaur instances will be allowed.
+# If a user is not in this or in the `registered_service_accounts` list, only EVAL central instances will be allowed.
 # - "id": is the organisation id
-# - "any_user": "any_user": Controls whether to allow all users to create standard dinosaur instances with this organisation if "registered_users" list is empty.
+# - "any_user": "any_user": Controls whether to allow all users to create standard central instances with this organisation if "registered_users" list is empty.
 # - max_allowed_instances: is the maximum number of instances this orgnisation. Defaults to the global value of `max-allowed-instances` which has different values for distinct environments.
 # - "registered_users": A list of registered users for this organisation. If empty, no one is registered unless "any_user" is set to true.
 #      - username: is the account of the user. The username must be unique within the organisation and across organisations.