refactor!: Reworks service names for consistent naming

BREAKING CHANGE: Many sevice names have changed in order to conform with core-, support-, app- and device- naming standard. Impact should be minimal unless scripts have references to the old service names, rather than container names. Container name havent chnaged except for app-functional-tests' which is now edgex-app-functional-tests closes edgexfoundry#231 Signed-off-by: Leonard Goodell <[email protected]>
lenny-goodell · Apr 3, 2023 · 0c2321f · 0c2321f
1 parent b6c4236
commit 0c2321f
Show file tree

Hide file tree

Showing 49 changed files with 4,770 additions and 4,774 deletions.
diff --git a/compose-builder/Makefile b/compose-builder/Makefile
@@ -360,12 +360,12 @@ ifeq (asc-http, $(filter asc-http,$(ARGS)))
 		endif
 		# when no security mode (no-secty) not explicitly specified,
 		# then we also need to add the secure version on top of base yml by default.
-		extension_file:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" ./gen_secure_compose_ext.sh app-service-http-export \
+		extension_file:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" ./gen_secure_compose_ext.sh app-http-export \
 			app-http-export app-service-configurable)
 		COMPOSE_FILES:=$(COMPOSE_FILES) -f $(extension_file)
 		# add runtime token config for delayed-start if specified
 		ifeq (delayed-start, $(filter delayed-start,$(ARGS)))
-			ext_file:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" ./gen_runtime_token_config_compose_ext.sh app-service-http-export)
+			ext_file:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" ./gen_runtime_token_config_compose_ext.sh app-http-export)
 			COMPOSE_FILES:=$(COMPOSE_FILES) -f $(ext_file)
 		endif
 	endif
@@ -390,12 +390,12 @@ ifeq (asc-mqtt, $(filter asc-mqtt,$(ARGS)))
 		endif
 		# when no security mode (no-secty) not explicitly specified,
 		# then we also need to add the secure version on top of base yml by default.
-		extension_file:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" IS_MQTT_BUS="$(IS_MQTT_BUS)" ./gen_secure_compose_ext.sh app-service-mqtt-export \
+		extension_file:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" IS_MQTT_BUS="$(IS_MQTT_BUS)" ./gen_secure_compose_ext.sh app-mqtt-export \
 			app-mqtt-export app-service-configurable)
 		COMPOSE_FILES:=$(COMPOSE_FILES) -f $(extension_file)
 		# add runtime token config for delayed-start if specified
 		ifeq (delayed-start, $(filter delayed-start,$(ARGS)))
-			ext_file:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" ./gen_runtime_token_config_compose_ext.sh app-service-mqtt-export)
+			ext_file:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" ./gen_runtime_token_config_compose_ext.sh app-mqtt-export)
 			COMPOSE_FILES:=$(COMPOSE_FILES) -f $(ext_file)
 		endif
 	endif
@@ -416,12 +416,12 @@ ifeq (asc-sample, $(filter asc-sample,$(ARGS)))
 		endif
 		# when no security mode (no-secty) not explicitly specified,
 		# then we also need to add the secure version on top of base yml by default.
-		extension_file:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" ./gen_secure_compose_ext.sh app-service-sample \
+		extension_file:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" ./gen_secure_compose_ext.sh app-sample \
 			app-sample app-service-configurable)
 		COMPOSE_FILES:=$(COMPOSE_FILES) -f $(extension_file)
 		# add runtime token config for delayed-start if specified
 		ifeq (delayed-start, $(filter delayed-start,$(ARGS)))
-			ext_file:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" ./gen_runtime_token_config_compose_ext.sh app-service-sample)
+			ext_file:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" ./gen_runtime_token_config_compose_ext.sh app-sample)
 			COMPOSE_FILES:=$(COMPOSE_FILES) -f $(ext_file)
 		endif
 	endif
@@ -496,12 +496,12 @@ ifeq (asc-ex-mqtt, $(filter asc-ex-mqtt,$(ARGS)))
 		endif
 		# when no security mode (no-secty) not explicitly specified,
 		# then we also need to add the secure version on top of base yml by default.
-		extension_file:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" IS_MQTT_BUS="$(IS_MQTT_BUS)" ./gen_secure_compose_ext.sh app-service-external-mqtt-trigger \
+		extension_file:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" IS_MQTT_BUS="$(IS_MQTT_BUS)" ./gen_secure_compose_ext.sh app-external-mqtt-trigger \
 			app-external-mqtt-trigger app-service-configurable)
 		COMPOSE_FILES:=$(COMPOSE_FILES) -f $(extension_file)
 		# add runtime token config for delayed-start if specified
 		ifeq (delayed-start, $(filter delayed-start,$(ARGS)))
-			ext_file:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" ./gen_runtime_token_config_compose_ext.sh app-service-external-mqtt-trigger)
+			ext_file:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" ./gen_runtime_token_config_compose_ext.sh app-external-mqtt-trigger)
 			COMPOSE_FILES:=$(COMPOSE_FILES) -f $(ext_file)
 		endif
 	endif
@@ -584,15 +584,15 @@ ifeq (taf-secty, $(filter taf-secty,$(ARGS)))
 		IS_MQTT_BUS:=0
 	endif
 
-	asc_http_export_ext:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" ./gen_secure_compose_ext.sh app-service-http-export \
+	asc_http_export_ext:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" ./gen_secure_compose_ext.sh app-http-export \
 		app-http-export app-service-configurable)
-	asc_mqtt_export_ext:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" IS_MQTT_BUS="$(IS_MQTT_BUS)" ./gen_secure_compose_ext.sh app-service-mqtt-export \
+	asc_mqtt_export_ext:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" IS_MQTT_BUS="$(IS_MQTT_BUS)" ./gen_secure_compose_ext.sh app-mqtt-export \
 		app-mqtt-export app-service-configurable)
-	scalability_mqtt_export_ext:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" IS_MQTT_BUS="$(IS_MQTT_BUS)" ./gen_secure_compose_ext.sh scalability-test-mqtt-export \
+	scalability_mqtt_export_ext:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" IS_MQTT_BUS="$(IS_MQTT_BUS)" ./gen_secure_compose_ext.sh app-scalability-test-mqtt-export \
 		app-scalability-test-mqtt-export app-service-configurable)
-	asc_external_mqtt_trigger_ext:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" IS_MQTT_BUS="$(IS_MQTT_BUS)" ./gen_secure_compose_ext.sh app-service-external-mqtt-trigger \
+	asc_external_mqtt_trigger_ext:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" IS_MQTT_BUS="$(IS_MQTT_BUS)" ./gen_secure_compose_ext.sh app-external-mqtt-trigger \
 		app-external-mqtt-trigger app-service-configurable)
-	asc_sample_ext:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" ./gen_secure_compose_ext.sh app-service-sample \
+	asc_sample_ext:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" ./gen_secure_compose_ext.sh app-sample \
 		app-sample app-service-configurable)
 	ds_rest_ext:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" ./gen_secure_compose_ext.sh device-rest)
 	# taf has its special place holder from taf-device-services-mods and thus we need to keep it
@@ -648,7 +648,7 @@ else
     			-f add-mqtt-broker.yml \
 				-f add-taf-mqtt-broker.yml \
 			-f add-delayed-start-services.yml
-			asc_mqtt_export_ext:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)"  IS_MQTT_BUS="0" ./gen_secure_compose_ext.sh app-service-mqtt-export \
+			asc_mqtt_export_ext:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)"  IS_MQTT_BUS="0" ./gen_secure_compose_ext.sh app-mqtt-export \
 				app-mqtt-export app-service-configurable)
 			ds_virtual_ext:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" ./gen_secure_compose_ext.sh device-virtual)
 			ds_rest_ext:= $(shell GEN_EXT_DIR="$(GEN_EXT_DIR)" ./gen_secure_compose_ext.sh device-rest)

diff --git a/compose-builder/add-app-rfid-llrp-inventory.yml b/compose-builder/add-app-rfid-llrp-inventory.yml
@@ -31,7 +31,7 @@ services:
       SERVICE_HOST: edgex-app-rfid-llrp-inventory
     depends_on:
       - consul
-      - data
+      - core-data
     read_only: true
     restart: always
     networks:

diff --git a/compose-builder/add-asc-external-mqtt-trigger.yml b/compose-builder/add-asc-external-mqtt-trigger.yml
@@ -16,7 +16,7 @@
 version: '3.7'
 
 services:
-  app-service-external-mqtt-trigger:
+  app-external-mqtt-trigger:
     image: ${APP_SVC_REPOSITORY}/app-service-configurable${ARCH}:${APP_SERVICE_CONFIG_VERSION}
     ports:
       - 127.0.0.1:59706:59706/tcp
@@ -33,7 +33,7 @@ services:
       WRITABLE_LOGLEVEL: INFO
     depends_on:
       - consul
-      - data
+      - core-data
     read_only: true
     restart: always
     networks:

diff --git a/compose-builder/add-asc-http-export.yml b/compose-builder/add-asc-http-export.yml
@@ -16,7 +16,7 @@
 version: '3.7'
 
 services:
-  app-service-http-export:
+  app-http-export:
     image: ${APP_SVC_REPOSITORY}/app-service-configurable${ARCH}:${APP_SERVICE_CONFIG_VERSION}
     ports:
       - 127.0.0.1:59704:59704/tcp
@@ -31,7 +31,7 @@ services:
       WRITABLE_LOGLEVEL: INFO  # allows scripts to find and change with sed
     depends_on:
       - consul
-      - data
+      - core-data
     read_only: true
     restart: always
     networks:

diff --git a/compose-builder/add-asc-metrics-influxdb.yml b/compose-builder/add-asc-metrics-influxdb.yml
@@ -29,7 +29,7 @@ services:
       EDGEX_PROFILE: metrics-influxdb
     depends_on:
       - consul
-      - data
+      - core-data
     read_only: true
     restart: always
     networks:

diff --git a/compose-builder/add-asc-mqtt-export.yml b/compose-builder/add-asc-mqtt-export.yml
@@ -16,7 +16,7 @@
 version: '3.7'
 
 services:
-  app-service-mqtt-export:
+  app-mqtt-export:
     image: ${APP_SVC_REPOSITORY}/app-service-configurable${ARCH}:${APP_SERVICE_CONFIG_VERSION}
     ports:
       - 127.0.0.1:59703:59703/tcp
@@ -32,7 +32,7 @@ services:
       WRITABLE_LOGLEVEL: INFO # allows scripts to find and change with sed
     depends_on:
       - consul
-      - data
+      - core-data
     read_only: true
     restart: always
     networks:

diff --git a/compose-builder/add-asc-sample.yml b/compose-builder/add-asc-sample.yml
@@ -16,7 +16,7 @@
 version: '3.7'
 
 services:
-  app-service-sample:
+  app-sample:
     image: ${APP_SVC_REPOSITORY}/app-service-configurable${ARCH}:${APP_SERVICE_CONFIG_VERSION}
     ports:
       - 127.0.0.1:59700:59700/tcp
@@ -32,7 +32,7 @@ services:
       CLIENTS_SUPPORT-NOTIFICATIONS_HOST: edgex-support-notifications
     depends_on:
       - consul
-      - data
+      - core-data
     read_only: true
     restart: always
     networks:

diff --git a/compose-builder/add-device-bacnet.yml b/compose-builder/add-device-bacnet.yml
@@ -30,8 +30,8 @@ services:
       SERVICE_HOST: edgex-device-bacnet
     depends_on:
       - consul
-      - data
-      - metadata
+      - core-data
+      - core-metadata
     security_opt: 
       - no-new-privileges:true
     read_only: true

diff --git a/compose-builder/add-device-coap.yml b/compose-builder/add-device-coap.yml
@@ -32,8 +32,8 @@ services:
       SERVICE_HOST: edgex-device-coap
     depends_on:
       - consul
-      - data
-      - metadata
+      - core-data
+      - core-metadata
     security_opt: 
       - no-new-privileges:true
     user: "${EDGEX_USER}:${EDGEX_GROUP}"
diff --git a/compose-builder/add-device-gpio.yml b/compose-builder/add-device-gpio.yml
@@ -32,8 +32,8 @@ services:
       SERVICE_HOST: edgex-device-gpio
     depends_on:
       - consul
-      - data
-      - metadata
+      - core-data
+      - core-metadata
     security_opt: 
       - no-new-privileges:true
     user: "${EDGEX_USER}:${EDGEX_GROUP}"
diff --git a/compose-builder/add-device-modbus.yml b/compose-builder/add-device-modbus.yml
@@ -30,8 +30,8 @@ services:
       SERVICE_HOST: edgex-device-modbus
     depends_on:
       - consul
-      - data
-      - metadata
+      - core-data
+      - core-metadata
     security_opt: 
       - no-new-privileges:true
     read_only: true

diff --git a/compose-builder/add-device-mqtt.yml b/compose-builder/add-device-mqtt.yml
@@ -33,8 +33,8 @@ services:
       MQTTBROKERINFO_HOST: edgex-mqtt-broker
     depends_on:
       - consul
-      - data
-      - metadata
+      - core-data
+      - core-metadata
       - mqtt-broker
     security_opt: 
       - no-new-privileges:true

diff --git a/compose-builder/add-device-onvif-camera.yml b/compose-builder/add-device-onvif-camera.yml
@@ -33,8 +33,8 @@ services:
       SERVICE_HOST: edgex-device-onvif-camera
     depends_on:
       - consul
-      - data
-      - metadata
+      - core-data
+      - core-metadata
     security_opt:
       - no-new-privileges:true
     user: "${EDGEX_USER}:${EDGEX_GROUP}"
diff --git a/compose-builder/add-device-rest.yml b/compose-builder/add-device-rest.yml
@@ -32,8 +32,8 @@ services:
       SERVICE_HOST: edgex-device-rest
     depends_on:
       - consul
-      - data
-      - metadata
+      - core-data
+      - core-metadata
     security_opt: 
       - no-new-privileges:true
     user: "${EDGEX_USER}:${EDGEX_GROUP}"
diff --git a/compose-builder/add-device-rfid-llrp.yml b/compose-builder/add-device-rfid-llrp.yml
@@ -32,8 +32,8 @@ services:
       SERVICE_HOST: edgex-device-rfid-llrp
     depends_on:
       - consul
-      - data
-      - metadata
+      - core-data
+      - core-metadata
     security_opt: 
       - no-new-privileges:true
     user: "${EDGEX_USER}:${EDGEX_GROUP}"
diff --git a/compose-builder/add-device-snmp.yml b/compose-builder/add-device-snmp.yml
@@ -30,8 +30,8 @@ services:
       SERVICE_HOST: edgex-device-snmp
     depends_on:
       - consul
-      - data
-      - metadata
+      - core-data
+      - core-metadata
     security_opt: 
       - no-new-privileges:true
     read_only: true

diff --git a/compose-builder/add-device-usb-camera.yml b/compose-builder/add-device-usb-camera.yml
@@ -34,8 +34,8 @@ services:
       SERVICE_HOST: edgex-device-usb-camera
     depends_on:
       - consul
-      - data
-      - metadata
+      - core-data
+      - core-metadata
     security_opt:
       - no-new-privileges:true
     user: root:root

diff --git a/compose-builder/add-device-virtual.yml b/compose-builder/add-device-virtual.yml
@@ -32,8 +32,8 @@ services:
       SERVICE_HOST: edgex-device-virtual
     depends_on:
       - consul
-      - data
-      - metadata
+      - core-data
+      - core-metadata
     security_opt: 
       - no-new-privileges:true
     user: "${EDGEX_USER}:${EDGEX_GROUP}"
diff --git a/compose-builder/add-mqtt-messagebus.yml b/compose-builder/add-mqtt-messagebus.yml
@@ -16,15 +16,15 @@
 version: '3.7'
 
 services:
-  common-config:
+  core-common-config-bootstrapper:
     environment:
       ALL_SERVICES_MESSAGEBUS_TYPE: mqtt
       ALL_SERVICES_MESSAGEBUS_PROTOCOL: tcp
       ALL_SERVICES_MESSAGEBUS_HOST: edgex-mqtt-broker
       ALL_SERVICES_MESSAGEBUS_PORT: "1883"
       ALL_SERVICES_MESSAGEBUS_AUTHMODE: none
 
-  rulesengine:
+  rules-engine:
     environment:
       CONNECTION__EDGEX__MQTTMSGBUS__PORT: 1883
       CONNECTION__EDGEX__MQTTMSGBUS__PROTOCOL: tcp

diff --git a/compose-builder/add-nats-messagebus.yml b/compose-builder/add-nats-messagebus.yml
@@ -36,15 +36,15 @@ services:
     volumes:
       - nats-data:/tmp/nats
 
-  common-config:
+  core-common-config-bootstrapper:
     environment:
       ALL_SERVICES_MESSAGEBUS_TYPE: nats-jetstream
       ALL_SERVICES_MESSAGEBUS_PROTOCOL: tcp
       ALL_SERVICES_MESSAGEBUS_HOST: edgex-nats-server
       ALL_SERVICES_MESSAGEBUS_PORT: "4222"
       ALL_SERVICES_MESSAGEBUS_AUTHMODE: none
 
-  rulesengine:
+  rules-engine:
     environment:
       CONNECTION__EDGEX__NATSMSGBUS__PORT: 4222
       CONNECTION__EDGEX__NATSMSGBUS__PROTOCOL: tcp

diff --git a/compose-builder/add-secure-mqtt-broker.yml b/compose-builder/add-secure-mqtt-broker.yml
@@ -35,6 +35,6 @@ services:
     - /tmp/edgex/secrets/security-bootstrapper-messagebus:/tmp/edgex/secrets/security-bootstrapper-messagebus:ro,z
     depends_on:
       - security-bootstrapper
-      - secretstore-setup 
+      - security-secretstore-setup 
     # root privilege required for bootstrapper's process
     user: root:root
diff --git a/compose-builder/add-secure-mqtt-messagebus.yml b/compose-builder/add-secure-mqtt-messagebus.yml
@@ -20,19 +20,19 @@ volumes:
   kuiper-connections:
 
 services:
-  secretstore-setup:
+  security-secretstore-setup:
     environment:
       SECUREMESSAGEBUS_TYPE: mqtt
     volumes:
       - kuiper-sources:/tmp/kuiper
       - kuiper-connections:/tmp/kuiper-connections
 
-  common-config:
+  core-common-config-bootstrapper:
     environment:
       ALL_SERVICES_MESSAGEBUS_AUTHMODE: usernamepassword
       ALL_SERVICES_MESSAGEBUS_SECRETNAME: message-bus
 
-  rulesengine:
+  rules-engine:
     entrypoint: [ "/edgex-init/kuiper_wait_install.sh" ]
     env_file:
       - common-sec-stage-gate.env
@@ -42,6 +42,6 @@ services:
       - edgex-init:/edgex-init:ro
     depends_on:
       - security-bootstrapper
-      - secretstore-setup
+      - security-secretstore-setup
       - database