fix: use local messages for resources

googleapis · Apr 14, 2020 · 01ae6ad · 01ae6ad
1 parent dbfcc4b
commit 01ae6ad
Show file tree

Hide file tree

Showing 18 changed files with 110 additions and 2,541 deletions.
diff --git a/baselines/logging/src/v2/logging_service_v2_client.ts.baseline b/baselines/logging/src/v2/logging_service_v2_client.ts.baseline
@@ -169,9 +169,6 @@ export class LoggingServiceV2Client {
       folderSinkPathTemplate: new this._gaxModule.PathTemplate(
         'folders/{folder}/sinks/{sink}'
       ),
-      locationPathTemplate: new this._gaxModule.PathTemplate(
-        'projects/{project}/locations/{location}'
-      ),
       logMetricPathTemplate: new this._gaxModule.PathTemplate(
         'projects/{project}/metrics/{metric}'
       ),
@@ -1554,42 +1551,6 @@ export class LoggingServiceV2Client {
     return this.pathTemplates.folderSinkPathTemplate.match(folderSinkName).sink;
   }
 
-  /**
-   * Return a fully-qualified location resource name string.
-   *
-   * @param {string} project
-   * @param {string} location
-   * @returns {string} Resource name string.
-   */
-  locationPath(project:string,location:string) {
-    return this.pathTemplates.locationPathTemplate.render({
-      project: project,
-      location: location,
-    });
-  }
-
-  /**
-   * Parse the project from Location resource.
-   *
-   * @param {string} locationName
-   *   A fully-qualified path representing Location resource.
-   * @returns {string} A string representing the project.
-   */
-  matchProjectFromLocationName(locationName: string) {
-    return this.pathTemplates.locationPathTemplate.match(locationName).project;
-  }
-
-  /**
-   * Parse the location from Location resource.
-   *
-   * @param {string} locationName
-   *   A fully-qualified path representing Location resource.
-   * @returns {string} A string representing the location.
-   */
-  matchLocationFromLocationName(locationName: string) {
-    return this.pathTemplates.locationPathTemplate.match(locationName).location;
-  }
-
   /**
    * Return a fully-qualified logMetric resource name string.
    *

diff --git a/baselines/logging/src/v2/metrics_service_v2_client.ts.baseline b/baselines/logging/src/v2/metrics_service_v2_client.ts.baseline
@@ -169,9 +169,6 @@ export class MetricsServiceV2Client {
       folderSinkPathTemplate: new this._gaxModule.PathTemplate(
         'folders/{folder}/sinks/{sink}'
       ),
-      locationPathTemplate: new this._gaxModule.PathTemplate(
-        'projects/{project}/locations/{location}'
-      ),
       logMetricPathTemplate: new this._gaxModule.PathTemplate(
         'projects/{project}/metrics/{metric}'
       ),
@@ -1188,42 +1185,6 @@ export class MetricsServiceV2Client {
     return this.pathTemplates.folderSinkPathTemplate.match(folderSinkName).sink;
   }
 
-  /**
-   * Return a fully-qualified location resource name string.
-   *
-   * @param {string} project
-   * @param {string} location
-   * @returns {string} Resource name string.
-   */
-  locationPath(project:string,location:string) {
-    return this.pathTemplates.locationPathTemplate.render({
-      project: project,
-      location: location,
-    });
-  }
-
-  /**
-   * Parse the project from Location resource.
-   *
-   * @param {string} locationName
-   *   A fully-qualified path representing Location resource.
-   * @returns {string} A string representing the project.
-   */
-  matchProjectFromLocationName(locationName: string) {
-    return this.pathTemplates.locationPathTemplate.match(locationName).project;
-  }
-
-  /**
-   * Parse the location from Location resource.
-   *
-   * @param {string} locationName
-   *   A fully-qualified path representing Location resource.
-   * @returns {string} A string representing the location.
-   */
-  matchLocationFromLocationName(locationName: string) {
-    return this.pathTemplates.locationPathTemplate.match(locationName).location;
-  }
-
   /**
    * Return a fully-qualified logMetric resource name string.
    *

diff --git a/baselines/logging/test/gapic_logging_service_v2_v2.ts.baseline b/baselines/logging/test/gapic_logging_service_v2_v2.ts.baseline
@@ -1237,44 +1237,6 @@ describe('v2.LoggingServiceV2Client', () => {
             });
         });
 
-        describe('location', () => {
-            const fakePath = "/rendered/path/location";
-            const expectedParameters = {
-                project: "projectValue",
-                location: "locationValue",
-            };
-            const client = new loggingservicev2Module.v2.LoggingServiceV2Client({
-                credentials: {client_email: 'bogus', private_key: 'bogus'},
-                projectId: 'bogus',
-            });
-            client.initialize();
-            client.pathTemplates.locationPathTemplate.render =
-                sinon.stub().returns(fakePath);
-            client.pathTemplates.locationPathTemplate.match =
-                sinon.stub().returns(expectedParameters);
-
-            it('locationPath', () => {
-                const result = client.locationPath("projectValue", "locationValue");
-                assert.strictEqual(result, fakePath);
-                assert((client.pathTemplates.locationPathTemplate.render as SinonStub)
-                    .getCall(-1).calledWith(expectedParameters));
-            });
-
-            it('matchProjectFromLocationName', () => {
-                const result = client.matchProjectFromLocationName(fakePath);
-                assert.strictEqual(result, "projectValue");
-                assert((client.pathTemplates.locationPathTemplate.match as SinonStub)
-                    .getCall(-1).calledWith(fakePath));
-            });
-
-            it('matchLocationFromLocationName', () => {
-                const result = client.matchLocationFromLocationName(fakePath);
-                assert.strictEqual(result, "locationValue");
-                assert((client.pathTemplates.locationPathTemplate.match as SinonStub)
-                    .getCall(-1).calledWith(fakePath));
-            });
-        });
-
         describe('logMetric', () => {
             const fakePath = "/rendered/path/logMetric";
             const expectedParameters = {

diff --git a/baselines/logging/test/gapic_metrics_service_v2_v2.ts.baseline b/baselines/logging/test/gapic_metrics_service_v2_v2.ts.baseline
@@ -1105,44 +1105,6 @@ describe('v2.MetricsServiceV2Client', () => {
             });
         });
 
-        describe('location', () => {
-            const fakePath = "/rendered/path/location";
-            const expectedParameters = {
-                project: "projectValue",
-                location: "locationValue",
-            };
-            const client = new metricsservicev2Module.v2.MetricsServiceV2Client({
-                credentials: {client_email: 'bogus', private_key: 'bogus'},
-                projectId: 'bogus',
-            });
-            client.initialize();
-            client.pathTemplates.locationPathTemplate.render =
-                sinon.stub().returns(fakePath);
-            client.pathTemplates.locationPathTemplate.match =
-                sinon.stub().returns(expectedParameters);
-
-            it('locationPath', () => {
-                const result = client.locationPath("projectValue", "locationValue");
-                assert.strictEqual(result, fakePath);
-                assert((client.pathTemplates.locationPathTemplate.render as SinonStub)
-                    .getCall(-1).calledWith(expectedParameters));
-            });
-
-            it('matchProjectFromLocationName', () => {
-                const result = client.matchProjectFromLocationName(fakePath);
-                assert.strictEqual(result, "projectValue");
-                assert((client.pathTemplates.locationPathTemplate.match as SinonStub)
-                    .getCall(-1).calledWith(fakePath));
-            });
-
-            it('matchLocationFromLocationName', () => {
-                const result = client.matchLocationFromLocationName(fakePath);
-                assert.strictEqual(result, "locationValue");
-                assert((client.pathTemplates.locationPathTemplate.match as SinonStub)
-                    .getCall(-1).calledWith(fakePath));
-            });
-        });
-
         describe('logMetric', () => {
             const fakePath = "/rendered/path/logMetric";
             const expectedParameters = {