update tests

Author: hlshen

scripts/dataconnect-test/templates/dataconnect.yaml

@@ -1,4 +1,4 @@
-specVersion: "v1alpha"
+specVersion: "v1beta"
 serviceId: "__serviceId__"
 location: "us-central1"
 schema:

src/dataconnect/client.spec.ts

@@ -4,6 +4,7 @@ import * as nock from "nock";
 import * as client from "./client";
 import { dataconnectOrigin } from "../api";
 
+const API_VERSION = "v1beta";
 describe("DataConnect control plane client", () => {
   afterEach(() => {
     nock.cleanAll();
@@ -12,28 +13,30 @@ describe("DataConnect control plane client", () => {
     it("Should delete all child resources", async () => {
       const testService = "projects/test/locations/us-central1/services/test-service";
       const fake = nock(dataconnectOrigin());
-      fake.get(`/v1alpha/${testService}/connectors?pageSize=100&pageToken=&fields=`).reply(200, {
-        connectors: [
-          { name: `${testService}/connectors/c1` },
-          { name: `${testService}/connectors/c2` },
-        ],
-      });
       fake
-        .delete(`/v1alpha/${testService}/connectors/c1`)
+        .get(`/${API_VERSION}/${testService}/connectors?pageSize=100&pageToken=&fields=`)
+        .reply(200, {
+          connectors: [
+            { name: `${testService}/connectors/c1` },
+            { name: `${testService}/connectors/c2` },
+          ],
+        });
+      fake
+        .delete(`/${API_VERSION}/${testService}/connectors/c1`)
         .reply(200, { name: "projects/test/operations/abc123" });
       fake
-        .delete(`/v1alpha/${testService}/connectors/c2`)
+        .delete(`/${API_VERSION}/${testService}/connectors/c2`)
         .reply(200, { name: "projects/test/operations/def456" });
       fake
-        .delete(`/v1alpha/${testService}/schemas/main`)
+        .delete(`/${API_VERSION}/${testService}/schemas/main`)
         .reply(200, { name: "projects/test/operations/ghi123" });
       fake
-        .delete(`/v1alpha/${testService}`)
+        .delete(`/${API_VERSION}/${testService}`)
         .reply(200, { name: "projects/test/operations/jkl456" });
-      fake.get("/v1alpha/projects/test/operations/abc123").reply(200, { done: true });
-      fake.get("/v1alpha/projects/test/operations/def456").reply(200, { done: true });
-      fake.get("/v1alpha/projects/test/operations/ghi123").reply(200, { done: true });
-      fake.get("/v1alpha/projects/test/operations/jkl456").reply(200, { done: true });
+      fake.get("/${API_VERSION}/projects/test/operations/abc123").reply(200, { done: true });
+      fake.get("/${API_VERSION}/projects/test/operations/def456").reply(200, { done: true });
+      fake.get("/${API_VERSION}/projects/test/operations/ghi123").reply(200, { done: true });
+      fake.get("/${API_VERSION}/projects/test/operations/jkl456").reply(200, { done: true });
 
       await client.deleteServiceAndChildResources(testService);
 
@@ -43,17 +46,19 @@ describe("DataConnect control plane client", () => {
     it("Succeed when there are no connectors", async () => {
       const testService = "projects/test/locations/us-central1/services/test-service";
       const fake = nock(dataconnectOrigin());
-      fake.get(`/v1alpha/${testService}/connectors?pageSize=100&pageToken=&fields=`).reply(200, {
-        connectors: [],
-      });
       fake
-        .delete(`/v1alpha/${testService}/schemas/main`)
+        .get(`/${API_VERSION}/${testService}/connectors?pageSize=100&pageToken=&fields=`)
+        .reply(200, {
+          connectors: [],
+        });
+      fake
+        .delete(`/${API_VERSION}/${testService}/schemas/main`)
         .reply(200, { name: "projects/test/operations/ghi123" });
       fake
-        .delete(`/v1alpha/${testService}`)
+        .delete(`/${API_VERSION}/${testService}`)
         .reply(200, { name: "projects/test/operations/jkl456" });
-      fake.get("/v1alpha/projects/test/operations/ghi123").reply(200, { done: true });
-      fake.get("/v1alpha/projects/test/operations/jkl456").reply(200, { done: true });
+      fake.get("/${API_VERSION}/projects/test/operations/ghi123").reply(200, { done: true });
+      fake.get("/${API_VERSION}/projects/test/operations/jkl456").reply(200, { done: true });
 
       await client.deleteServiceAndChildResources(testService);
 
@@ -63,14 +68,16 @@ describe("DataConnect control plane client", () => {
     it("Succeed when there is no schema", async () => {
       const testService = "projects/test/locations/us-central1/services/test-service";
       const fake = nock(dataconnectOrigin());
-      fake.get(`/v1alpha/${testService}/connectors?pageSize=100&pageToken=&fields=`).reply(200, {
-        connectors: [],
-      });
-      fake.delete(`/v1alpha/${testService}/schemas/main`).reply(404, {});
       fake
-        .delete(`/v1alpha/${testService}`)
+        .get(`/${API_VERSION}/${testService}/connectors?pageSize=100&pageToken=&fields=`)
+        .reply(200, {
+          connectors: [],
+        });
+      fake.delete(`/${API_VERSION}/${testService}/schemas/main`).reply(404, {});
+      fake
+        .delete(`/${API_VERSION}/${testService}`)
         .reply(200, { name: "projects/test/operations/jkl456" });
-      fake.get("/v1alpha/projects/test/operations/jkl456").reply(200, { done: true });
+      fake.get("/${API_VERSION}/projects/test/operations/jkl456").reply(200, { done: true });
 
       await client.deleteServiceAndChildResources(testService);
 

templates/init/dataconnect/dataconnect.yaml

@@ -1,4 +1,4 @@
-specVersion: "v1alpha"
+specVersion: "v1beta"
 serviceId: __serviceId__
 location: __location__
 schema: