feat: migrate environment_namespace to environment_id

api-description/apidocs.swagger.yaml

@@ -1097,9 +1097,9 @@ definitions:
         type: string
       event:
         $ref: '#/definitions/protobufAny'
-      environmentNamespace:
+      environmentId:
         type: string
-        description: SDK doens't need to set this field. It's set by gateway service.
+        description: service.
   clientSourceId:
     type: string
     enum:

api-description/web-api.swagger.yaml

@@ -2851,7 +2851,7 @@ definitions:
         type: string
       command:
         $ref: '#/definitions/accountChangeAPIKeyNameCommand'
-      environmentNamespace:
+      environmentId:
         type: string
   accountChangeAPIKeyNameResponse:
     type: object
@@ -2987,7 +2987,7 @@ definitions:
     properties:
       command:
         $ref: '#/definitions/accountCreateAPIKeyCommand'
-      environmentNamespace:
+      environmentId:
         type: string
   accountCreateAPIKeyResponse:
     type: object
@@ -3113,7 +3113,7 @@ definitions:
         type: string
       command:
         $ref: '#/definitions/accountDisableAPIKeyCommand'
-      environmentNamespace:
+      environmentId:
         type: string
   accountDisableAPIKeyResponse:
     type: object
@@ -3142,7 +3142,7 @@ definitions:
         type: string
       command:
         $ref: '#/definitions/accountEnableAPIKeyCommand'
-      environmentNamespace:
+      environmentId:
         type: string
   accountEnableAPIKeyResponse:
     type: object
@@ -3165,8 +3165,6 @@ definitions:
   accountEnvironmentAPIKey:
     type: object
     properties:
-      environmentNamespace:
-        type: string
       apiKey:
         $ref: '#/definitions/accountAPIKey'
       environmentDisabled:
@@ -3198,7 +3196,7 @@ definitions:
     properties:
       id:
         type: string
-      environmentNamespace:
+      environmentId:
         type: string
   accountGetAPIKeyResponse:
     type: object
@@ -3268,8 +3266,6 @@ definitions:
         format: int64
       cursor:
         type: string
-      environmentNamespace:
-        type: string
       orderBy:
         $ref: '#/definitions/accountListAPIKeysRequestOrderBy'
       orderDirection:
@@ -3278,6 +3274,8 @@ definitions:
         type: string
       disabled:
         type: boolean
+      environmentId:
+        type: string
   accountListAPIKeysRequestOrderBy:
     type: string
     enum:

hack/create-api-key/command.go

@@ -77,7 +77,7 @@ func (c *command) Run(ctx context.Context, metrics metrics.Metrics, logger *zap.
 			Name: *c.name,
 			Role: accountproto.APIKey_Role(role),
 		},
-		EnvironmentNamespace: *c.environmentNamespace,
+		EnvironmentId: *c.environmentNamespace,
 	})
 	if err != nil {
 		logger.Error("Failed to create api key", zap.Error(err))

hack/create-big-query-table/command.go

@@ -66,7 +66,7 @@ func (c *command) Run(ctx context.Context, metrics metrics.Metrics, logger *zap.
 	// Create tables
 	evaluationEventSchema := bigquery.Schema{
 		{Name: "id", Type: bigquery.StringFieldType},
-		{Name: "environment_namespace", Type: bigquery.StringFieldType},
+		{Name: "environment_id", Type: bigquery.StringFieldType},
 		{Name: "timestamp", Type: bigquery.TimestampFieldType},
 		{Name: "feature_id", Type: bigquery.StringFieldType},
 		{Name: "feature_version", Type: bigquery.IntegerFieldType},
@@ -85,7 +85,7 @@ func (c *command) Run(ctx context.Context, metrics metrics.Metrics, logger *zap.
 	}
 	goalEventSchema := bigquery.Schema{
 		{Name: "id", Type: bigquery.StringFieldType},
-		{Name: "environment_namespace", Type: bigquery.StringFieldType},
+		{Name: "environment_id", Type: bigquery.StringFieldType},
 		{Name: "timestamp", Type: bigquery.TimestampFieldType},
 		{Name: "goal_id", Type: bigquery.StringFieldType},
 		{Name: "value", Type: bigquery.FloatFieldType},

hack/delete-e2e-data-mysql/command.go

@@ -141,7 +141,7 @@ func (c *command) constructDeleteQuery(target *mysqlE2EInfo) (query string, args
 			DELETE FROM
 				%s
 			WHERE
-				environment_namespace = ? AND
+				environment_id = ? AND
 				%s LIKE ?
 		`, target.table, target.targetField)
 		args = []interface{}{
@@ -154,7 +154,7 @@ func (c *command) constructDeleteQuery(target *mysqlE2EInfo) (query string, args
 		DELETE FROM
 			%s
 		WHERE
-			environment_namespace = ?
+			environment_id = ?
 	`, target.table)
 	args = []interface{}{
 		envNamespace,

migration/mysql/20241113142932_update_environment_id_table.sql

@@ -0,0 +1,120 @@
+-- Step 1: Drop all foreign keys referencing environment_namespace
+ALTER TABLE auto_ops_rule DROP FOREIGN KEY foreign_auto_ops_rule_feature_id_environment_namespace;
+ALTER TABLE experiment DROP FOREIGN KEY foreign_experiment_feature_id_environment_namespace;
+ALTER TABLE ops_count 
+DROP FOREIGN KEY foreign_ops_count_feature_id_environment_namespace,
+DROP FOREIGN KEY foreign_ops_count_auto_ops_rule_id_environment_namespace;
+ALTER TABLE ops_progressive_rollout DROP FOREIGN KEY foreign_progressive_rollout_feature_id_environment_namespace;
+ALTER TABLE flag_trigger DROP FOREIGN KEY foreign_flag_trigger_feature_id_environment_namespace;
+ALTER TABLE segment_user DROP FOREIGN KEY foreign_segment_user_segment_id_environment_namespace;
+
+-- Step 2: Populate environment_id with values from environment_namespace
+UPDATE feature SET environment_id = environment_namespace;
+UPDATE account SET environment_id = environment_namespace;
+UPDATE api_key SET environment_id = environment_namespace;
+UPDATE audit_log SET environment_id = environment_namespace;
+UPDATE auto_ops_rule SET environment_id = environment_namespace;
+UPDATE experiment SET environment_id = environment_namespace;
+UPDATE experiment_result SET environment_id = environment_namespace;
+UPDATE feature_last_used_info SET environment_id = environment_namespace;
+UPDATE flag_trigger SET environment_id = environment_namespace;
+UPDATE goal SET environment_id = environment_namespace;
+UPDATE mau SET environment_id = environment_namespace;
+UPDATE ops_count SET environment_id = environment_namespace;
+UPDATE ops_progressive_rollout SET environment_id = environment_namespace;
+UPDATE push SET environment_id = environment_namespace;
+UPDATE segment SET environment_id = environment_namespace;
+UPDATE segment_user SET environment_id = environment_namespace;
+UPDATE subscription SET environment_id = environment_namespace;
+UPDATE tag SET environment_id = environment_namespace;
+
+-- Step 3: Change PRIMARY KEY to use environment_id instead of environment_namespace
+ALTER TABLE feature_last_used_info
+ALGORITHM=INPLACE,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (id, environment_id);
+
+ALTER TABLE mau
+ALGORITHM=INPLACE,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (user_id, yearmonth, source_id, environment_id);
+
+ALTER TABLE ops_count
+ALGORITHM=INPLACE,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (id, environment_id);
+
+ALTER TABLE ops_progressive_rollout
+ALGORITHM=INPLACE,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (id, environment_id);
+
+ALTER TABLE segment_user
+ALGORITHM=INPLACE,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (id, environment_id);
+
+ALTER TABLE feature
+ALGORITHM=INPLACE,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (id, environment_id);
+
+ALTER TABLE account
+ALGORITHM=INPLACE,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (id, environment_id);
+
+ALTER TABLE api_key
+ALGORITHM=INPLACE,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (id, environment_id);
+
+ALTER TABLE audit_log
+ALGORITHM=INPLACE,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (id, environment_id);
+
+ALTER TABLE auto_ops_rule
+ALGORITHM=INPLACE,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (id, environment_id);
+
+ALTER TABLE experiment
+ALGORITHM=INPLACE,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (id, environment_id);
+
+ALTER TABLE experiment_result
+ALGORITHM=INPLACE,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (id, environment_id);
+
+ALTER TABLE flag_trigger
+ALGORITHM=INPLACE,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (id, environment_id);
+
+ALTER TABLE goal
+ALGORITHM=INPLACE,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (id, environment_id);
+
+ALTER TABLE push
+ALGORITHM=INPLACE,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (id, environment_id);
+
+ALTER TABLE segment
+ALGORITHM=INPLACE,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (id, environment_id);
+
+ALTER TABLE subscription
+ALGORITHM=INPLACE,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (id, environment_id);
+
+ALTER TABLE tag
+ALGORITHM=INPLACE,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (id, environment_id);

migration/mysql/atlas.sum

@@ -1,4 +1,4 @@
-h1:OJvYQmdFDLoyPO32FuZtV3/wh6AE6KcLRc7Y+jadtE8=
+h1:V8cRpgqJinbttzFCPGa+rbd3Zrm6BGsTB0w58QlTuVs=
 20240626022133_initialization.sql h1:u9qmPkwWX7PN92qEcDDfR92lrMpwadQSMxUJgv6LjQ0=
 20240708065726_update_audit_log_table.sql h1:k7gK8Njv1yHMsYXAQtSgMaSbXy4lxyZ9MPzbJyMyyoM=
 20240815043128_update_auto_ops_rule_table.sql h1:6ib+XfS1uu9AUO3qESvkpUfOu3qUsLwHm9KHcrGEz0E=
@@ -11,3 +11,4 @@ h1:OJvYQmdFDLoyPO32FuZtV3/wh6AE6KcLRc7Y+jadtE8=
 20241028031327_add_org_url_unique.sql h1:Xn0Pilm+RRseqZZXdsIdXulwy+R69xIC6ygA8MD19CM=
 20241029011618_update_account_v2_table.sql h1:vcQDt2A4WdC0DP/SdZNjsl/T4oVrIVITgPRgc773Hn4=
 20241113125451_update_environment_namespace.sql h1:dqTCT/L3QtjMIsM788jAisRiDU0ItEx4m3xgOiuXU1k=
+20241113142932_update_environment_id_table.sql h1:MufoP4KqI2pl8lCV5OHhyITYC+VQcYJc3jSwDpqK0Ks=

pkg/account/api/api.go

@@ -263,15 +263,15 @@ func (s *AccountService) checkSystemAdminRole(
 func (s *AccountService) checkEnvironmentRole(
 	ctx context.Context,
 	requiredRole proto.AccountV2_Role_Environment,
-	environmentNamespace string,
+	environmentId string,
 	localizer locale.Localizer,
 ) (*eventproto.Editor, error) {
 	editor, err := role.CheckEnvironmentRole(
 		ctx,
 		requiredRole,
-		environmentNamespace,
+		environmentId,
 		func(email string) (*proto.AccountV2, error) {
-			account, err := s.getAccountV2ByEnvironmentID(ctx, email, environmentNamespace, localizer)
+			account, err := s.getAccountV2ByEnvironmentID(ctx, email, environmentId, localizer)
 			if err != nil {
 				return nil, err
 			}
@@ -285,7 +285,7 @@ func (s *AccountService) checkEnvironmentRole(
 				"Unauthenticated",
 				log.FieldsFromImcomingContext(ctx).AddFields(
 					zap.Error(err),
-					zap.String("environmentNamespace", environmentNamespace),
+					zap.String("environmentId", environmentId),
 				)...,
 			)
 			dt, err := statusUnauthenticated.WithDetails(&errdetails.LocalizedMessage{
@@ -301,7 +301,7 @@ func (s *AccountService) checkEnvironmentRole(
 				"Permission denied",
 				log.FieldsFromImcomingContext(ctx).AddFields(
 					zap.Error(err),
-					zap.String("environmentNamespace", environmentNamespace),
+					zap.String("environmentId", environmentId),
 				)...,
 			)
 			dt, err := statusPermissionDenied.WithDetails(&errdetails.LocalizedMessage{
@@ -317,7 +317,7 @@ func (s *AccountService) checkEnvironmentRole(
 				"Failed to check role",
 				log.FieldsFromImcomingContext(ctx).AddFields(
 					zap.Error(err),
-					zap.String("environmentNamespace", environmentNamespace),
+					zap.String("environmentId", environmentId),
 				)...,
 			)
 			dt, err := statusInternal.WithDetails(&errdetails.LocalizedMessage{