Revert "EVEREST-107 Rename TargetNamespaces to AllowedNamespaces"

.github/workflows/ci.yml

@@ -361,7 +361,7 @@ jobs:
             --operator.postgresql \
             --operator.xtradb-cluster \
             --skip-wizard \
-            --namespaces everest
+            --namespace everest
 
           # API_TOKEN is used later by "make test"
           echo "API_TOKEN=$(./bin/everest token reset --json | jq .token -r)" >> $GITHUB_ENV

api-tests/tests/backup-storages.spec.ts

@@ -25,7 +25,7 @@ test('add/list/get/delete s3 backup storage success', async ({request}) => {
         region: 'us-east-2',
         accessKey: 'sdfs',
         secretKey: 'sdfsdfsd',
-        allowedNamespaces: [testsNs]
+        targetNamespaces: [testsNs]
     }
 
     const response = await request.post(`/v1/backup-storages`, {
@@ -65,7 +65,7 @@ test('add/list/get/delete s3 backup storage success', async ({request}) => {
         bucketName: 'percona-test-backup-storage1',
         accessKey: 'otherAccessKey',
         secretKey: 'otherSecret',
-        allowedNamespaces: [testsNs]
+        targetNamespaces: [testsNs]
     }
     const updated = await request.patch(`/v1/backup-storages/${name}`, {
         data: updatePayload,
@@ -100,7 +100,7 @@ test('add/list/get/delete azure backup storage success', async ({request}) => {
         bucketName: 'percona-test-backup-storage',
         accessKey: 'sdfs',
         secretKey: 'sdfsdfsd',
-        allowedNamespaces: [testsNs]
+        targetNamespaces: [testsNs]
     }
 
     const response = await request.post(`/v1/backup-storages`, {
@@ -186,7 +186,7 @@ test('create backup storage failures', async ({request}) => {
                 region: 'us-east-2',
                 accessKey: 'ssdssd',
                 secretKey: 'ssdssdssdssd',
-                allowedNamespaces: [testsNs]
+                targetNamespaces: [testsNs]
             },
             errorText: '\'name\' is not RFC 1035 compatible',
         },
@@ -199,7 +199,7 @@ test('create backup storage failures', async ({request}) => {
                 region: 'us-east-2',
                 accessKey: 'ssdssd',
                 secretKey: 'ssdssdssdssd',
-                allowedNamespaces: [testsNs]
+                targetNamespaces: [testsNs]
             },
             errorText: '\'url\' is an invalid URL',
         },
@@ -210,7 +210,7 @@ test('create backup storage failures', async ({request}) => {
                 bucketName: 'invalid',
                 accessKey: 'ssdssd',
                 secretKey: 'ssdssdssdssd',
-                allowedNamespaces: [testsNs]
+                targetNamespaces: [testsNs]
             },
             errorText: 'Region is required',
         },
@@ -222,7 +222,7 @@ test('create backup storage failures', async ({request}) => {
                 bucketName: 'invalid',
                 accessKey: 'ssdssd',
                 secretKey: 'ssdssdssdssd',
-                allowedNamespaces: [testsNs]
+                targetNamespaces: [testsNs]
             },
             errorText: '"/type": value is not one of the allowed values',
         },
@@ -246,7 +246,7 @@ test('update backup storage failures', async ({request}) => {
         region: 'us-east-2',
         accessKey: 'sdfsdfs',
         secretKey: 'lkdfslsldfka',
-        allowedNamespaces: [testsNs]
+        targetNamespaces: [testsNs]
     }
     const response = await request.post(`/v1/backup-storages`, {
         data: createPayload,

api-tests/tests/database-cluster.spec.ts

@@ -27,7 +27,7 @@ test.beforeAll(async ({ request }) => {
     type: 'pmm',
     name: monitoringConfigName1,
     url: 'http://monitoring',
-    allowedNamespaces: [testsNs],
+    targetNamespaces: [testsNs],
     pmm: {
       apiKey: '123',
     },

api-tests/tests/helpers.ts

@@ -68,7 +68,7 @@ export const createBackupStorage = async (request, name) => {
     region: 'us-east-2',
     accessKey: 'sdfs',
     secretKey: 'sdfsdfsd',
-    allowedNamespaces: [testsNs],
+    targetNamespaces: [testsNs],
   }
 
   const response = await request.post(`/v1/backup-storages`, { data: storagePayload })

api-tests/tests/monitoring-instances.spec.ts

@@ -39,7 +39,7 @@ test('create monitoring instance with api key', async ({ request }) => {
     type: 'pmm',
     name: `${testPrefix}-key`,
     url: 'http://monitoring',
-    allowedNamespaces: [testsNs],
+    targetNamespaces: [testsNs],
     pmm: {
       apiKey: '123',
     },
@@ -60,7 +60,7 @@ test('create monitoring instance with user/password', async ({ request }) => {
     type: 'pmm',
     name: `${testPrefix}-pass`,
     url: 'http://127.0.0.1:8888',
-    allowedNamespaces: [testsNs],
+    targetNamespaces: [testsNs],
     pmm: {
       user: 'admin',
       password: 'admin',
@@ -82,7 +82,7 @@ test('create monitoring instance missing pmm', async ({ request }) => {
     type: 'pmm',
     name: 'monitoring-fail',
     url: 'http://monitoring-instance',
-    allowedNamespaces: [testsNs],
+    targetNamespaces: [testsNs],
   }
 
   const response = await request.post('/v1/monitoring-instances', { data })
@@ -95,7 +95,7 @@ test('create monitoring instance missing pmm credentials', async ({ request }) =
     type: 'pmm',
     name: 'monitoring-fail',
     url: 'http://monitoring-instance',
-    allowedNamespaces: [testsNs],
+    targetNamespaces: [testsNs],
     pmm: {},
   }
 
@@ -244,7 +244,7 @@ test('update monitoring instances failures', async ({ request }) => {
     type: 'pmm',
     name: `${testPrefix}-fail`,
     url: 'http://monitoring',
-    allowedNamespaces: [testsNs],
+    targetNamespaces: [testsNs],
     pmm: {
       apiKey: '123',
     },
@@ -301,7 +301,7 @@ async function createInstances(request: APIRequestContext, namePrefix: string, c
     type: 'pmm',
     name: '',
     url: 'http://monitoring-instance',
-    allowedNamespaces: [testsNs],
+    targetNamespaces: [testsNs],
     pmm: {
       apiKey: '123',
     },

api/backup_storage.go

@@ -41,13 +41,13 @@ func (e *EverestServer) ListBackupStorages(ctx echo.Context) error {
 	for _, bs := range backupList.Items {
 		s := bs
 		result = append(result, BackupStorage{
-			Type:              BackupStorageType(bs.Spec.Type),
-			Name:              s.Name,
-			Description:       &s.Spec.Description,
-			BucketName:        s.Spec.Bucket,
-			Region:            s.Spec.Region,
-			Url:               &s.Spec.EndpointURL,
-			AllowedNamespaces: s.Spec.AllowedNamespaces,
+			Type:             BackupStorageType(bs.Spec.Type),
+			Name:             s.Name,
+			Description:      &s.Spec.Description,
+			BucketName:       s.Spec.Bucket,
+			Region:           s.Spec.Region,
+			Url:              &s.Spec.EndpointURL,
+			TargetNamespaces: s.Spec.TargetNamespaces,
 		})
 	}
 
@@ -120,7 +120,7 @@ func (e *EverestServer) CreateBackupStorage(ctx echo.Context) error { //nolint:f
 			Bucket:                params.BucketName,
 			Region:                params.Region,
 			CredentialsSecretName: params.Name,
-			AllowedNamespaces:     params.AllowedNamespaces,
+			TargetNamespaces:      params.TargetNamespaces,
 		},
 	}
 	if params.Url != nil {
@@ -144,13 +144,13 @@ func (e *EverestServer) CreateBackupStorage(ctx echo.Context) error { //nolint:f
 		})
 	}
 	result := BackupStorage{
-		Type:              BackupStorageType(params.Type),
-		Name:              params.Name,
-		Description:       params.Description,
-		BucketName:        params.BucketName,
-		Region:            params.Region,
-		Url:               params.Url,
-		AllowedNamespaces: params.AllowedNamespaces,
+		Type:             BackupStorageType(params.Type),
+		Name:             params.Name,
+		Description:      params.Description,
+		BucketName:       params.BucketName,
+		Region:           params.Region,
+		Url:              params.Url,
+		TargetNamespaces: params.TargetNamespaces,
 	}
 
 	return ctx.JSON(http.StatusOK, result)
@@ -219,13 +219,13 @@ func (e *EverestServer) GetBackupStorage(ctx echo.Context, backupStorageName str
 		})
 	}
 	return ctx.JSON(http.StatusOK, BackupStorage{
-		Type:              BackupStorageType(s.Spec.Type),
-		Name:              s.Name,
-		Description:       &s.Spec.Description,
-		BucketName:        s.Spec.Bucket,
-		Region:            s.Spec.Region,
-		Url:               &s.Spec.EndpointURL,
-		AllowedNamespaces: s.Spec.AllowedNamespaces,
+		Type:             BackupStorageType(s.Spec.Type),
+		Name:             s.Name,
+		Description:      &s.Spec.Description,
+		BucketName:       s.Spec.Bucket,
+		Region:           s.Spec.Region,
+		Url:              &s.Spec.EndpointURL,
+		TargetNamespaces: s.Spec.TargetNamespaces,
 	})
 }
 
@@ -298,8 +298,8 @@ func (e *EverestServer) UpdateBackupStorage(ctx echo.Context, backupStorageName
 	if params.Description != nil {
 		bs.Spec.Description = *params.Description
 	}
-	if params.AllowedNamespaces != nil {
-		bs.Spec.AllowedNamespaces = *params.AllowedNamespaces
+	if params.TargetNamespaces != nil {
+		bs.Spec.TargetNamespaces = *params.TargetNamespaces
 	}
 
 	err = e.kubeClient.UpdateBackupStorage(c, bs)
@@ -310,13 +310,13 @@ func (e *EverestServer) UpdateBackupStorage(ctx echo.Context, backupStorageName
 		})
 	}
 	result := BackupStorage{
-		Type:              BackupStorageType(bs.Spec.Type),
-		Name:              bs.Name,
-		Description:       params.Description,
-		BucketName:        bs.Spec.Bucket,
-		Region:            bs.Spec.Region,
-		Url:               &bs.Spec.EndpointURL,
-		AllowedNamespaces: bs.Spec.AllowedNamespaces,
+		Type:             BackupStorageType(bs.Spec.Type),
+		Name:             bs.Name,
+		Description:      params.Description,
+		BucketName:       bs.Spec.Bucket,
+		Region:           bs.Spec.Region,
+		Url:              &bs.Spec.EndpointURL,
+		TargetNamespaces: bs.Spec.TargetNamespaces,
 	}
 
 	return ctx.JSON(http.StatusOK, result)