From cccc7d5d55ff7841871b92539752f6ab70be2844 Mon Sep 17 00:00:00 2001 From: sofisl <55454395+sofisl@users.noreply.github.com> Date: Thu, 25 Feb 2021 13:55:18 -0800 Subject: [PATCH] build: fix package name, rerun synthtool (#16) --- .../.jsdoc.js | 2 +- .../protos/protos.d.ts | 15 +--- .../protos/protos.js | 85 +------------------ .../protos/protos.json | 16 +--- .../src/v1beta2/gapic_metadata.json | 2 +- .../synth.metadata | 10 +-- .../system-test/fixtures/sample/src/index.js | 2 +- .../system-test/fixtures/sample/src/index.ts | 2 +- 8 files changed, 13 insertions(+), 121 deletions(-) diff --git a/packages/google-devtools-artifactregistry/.jsdoc.js b/packages/google-devtools-artifactregistry/.jsdoc.js index ae4ef0b6655..d273af3f05b 100644 --- a/packages/google-devtools-artifactregistry/.jsdoc.js +++ b/packages/google-devtools-artifactregistry/.jsdoc.js @@ -43,7 +43,7 @@ module.exports = { copyright: 'Copyright 2021 Google LLC', includeDate: false, sourceFiles: false, - systemName: 'artifactregistry', + systemName: '@google-cloud/artifact-registry', theme: 'lumen', default: { outputSourceFiles: false diff --git a/packages/google-devtools-artifactregistry/protos/protos.d.ts b/packages/google-devtools-artifactregistry/protos/protos.d.ts index 7439c657918..a02e54e95f8 100644 --- a/packages/google-devtools-artifactregistry/protos/protos.d.ts +++ b/packages/google-devtools-artifactregistry/protos/protos.d.ts @@ -3512,9 +3512,6 @@ export namespace google { /** ResourceDescriptor singular */ singular?: (string|null); - - /** ResourceDescriptor style */ - style?: (google.api.ResourceDescriptor.Style[]|null); } /** Represents a ResourceDescriptor. */ @@ -3544,9 +3541,6 @@ export namespace google { /** ResourceDescriptor singular. */ public singular: string; - /** ResourceDescriptor style. */ - public style: google.api.ResourceDescriptor.Style[]; - /** * Creates a new ResourceDescriptor instance using the specified properties. * @param [properties] Properties to set @@ -3626,12 +3620,6 @@ export namespace google { ORIGINALLY_SINGLE_PATTERN = 1, FUTURE_MULTI_PATTERN = 2 } - - /** Style enum. */ - enum Style { - STYLE_UNSPECIFIED = 0, - DECLARATIVE_FRIENDLY = 1 - } } /** Properties of a ResourceReference. */ @@ -4076,8 +4064,7 @@ export namespace google { REQUIRED = 2, OUTPUT_ONLY = 3, INPUT_ONLY = 4, - IMMUTABLE = 5, - UNORDERED_LIST = 6 + IMMUTABLE = 5 } } diff --git a/packages/google-devtools-artifactregistry/protos/protos.js b/packages/google-devtools-artifactregistry/protos/protos.js index f612d7b81bf..d92b377d926 100644 --- a/packages/google-devtools-artifactregistry/protos/protos.js +++ b/packages/google-devtools-artifactregistry/protos/protos.js @@ -7825,7 +7825,6 @@ * @property {google.api.ResourceDescriptor.History|null} [history] ResourceDescriptor history * @property {string|null} [plural] ResourceDescriptor plural * @property {string|null} [singular] ResourceDescriptor singular - * @property {Array.|null} [style] ResourceDescriptor style */ /** @@ -7838,7 +7837,6 @@ */ function ResourceDescriptor(properties) { this.pattern = []; - this.style = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -7893,14 +7891,6 @@ */ ResourceDescriptor.prototype.singular = ""; - /** - * ResourceDescriptor style. - * @member {Array.} style - * @memberof google.api.ResourceDescriptor - * @instance - */ - ResourceDescriptor.prototype.style = $util.emptyArray; - /** * Creates a new ResourceDescriptor instance using the specified properties. * @function create @@ -7938,12 +7928,6 @@ writer.uint32(/* id 5, wireType 2 =*/42).string(message.plural); if (message.singular != null && Object.hasOwnProperty.call(message, "singular")) writer.uint32(/* id 6, wireType 2 =*/50).string(message.singular); - if (message.style != null && message.style.length) { - writer.uint32(/* id 10, wireType 2 =*/82).fork(); - for (var i = 0; i < message.style.length; ++i) - writer.int32(message.style[i]); - writer.ldelim(); - } return writer; }; @@ -7998,16 +7982,6 @@ case 6: message.singular = reader.string(); break; - case 10: - if (!(message.style && message.style.length)) - message.style = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) - message.style.push(reader.int32()); - } else - message.style.push(reader.int32()); - break; default: reader.skipType(tag & 7); break; @@ -8071,18 +8045,6 @@ if (message.singular != null && message.hasOwnProperty("singular")) if (!$util.isString(message.singular)) return "singular: string expected"; - if (message.style != null && message.hasOwnProperty("style")) { - if (!Array.isArray(message.style)) - return "style: array expected"; - for (var i = 0; i < message.style.length; ++i) - switch (message.style[i]) { - default: - return "style: enum value[] expected"; - case 0: - case 1: - break; - } - } return null; }; @@ -8127,23 +8089,6 @@ message.plural = String(object.plural); if (object.singular != null) message.singular = String(object.singular); - if (object.style) { - if (!Array.isArray(object.style)) - throw TypeError(".google.api.ResourceDescriptor.style: array expected"); - message.style = []; - for (var i = 0; i < object.style.length; ++i) - switch (object.style[i]) { - default: - case "STYLE_UNSPECIFIED": - case 0: - message.style[i] = 0; - break; - case "DECLARATIVE_FRIENDLY": - case 1: - message.style[i] = 1; - break; - } - } return message; }; @@ -8160,10 +8105,8 @@ if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) { + if (options.arrays || options.defaults) object.pattern = []; - object.style = []; - } if (options.defaults) { object.type = ""; object.nameField = ""; @@ -8186,11 +8129,6 @@ object.plural = message.plural; if (message.singular != null && message.hasOwnProperty("singular")) object.singular = message.singular; - if (message.style && message.style.length) { - object.style = []; - for (var j = 0; j < message.style.length; ++j) - object.style[j] = options.enums === String ? $root.google.api.ResourceDescriptor.Style[message.style[j]] : message.style[j]; - } return object; }; @@ -8221,20 +8159,6 @@ return values; })(); - /** - * Style enum. - * @name google.api.ResourceDescriptor.Style - * @enum {number} - * @property {number} STYLE_UNSPECIFIED=0 STYLE_UNSPECIFIED value - * @property {number} DECLARATIVE_FRIENDLY=1 DECLARATIVE_FRIENDLY value - */ - ResourceDescriptor.Style = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "STYLE_UNSPECIFIED"] = 0; - values[valuesById[1] = "DECLARATIVE_FRIENDLY"] = 1; - return values; - })(); - return ResourceDescriptor; })(); @@ -9362,7 +9286,6 @@ * @property {number} OUTPUT_ONLY=3 OUTPUT_ONLY value * @property {number} INPUT_ONLY=4 INPUT_ONLY value * @property {number} IMMUTABLE=5 IMMUTABLE value - * @property {number} UNORDERED_LIST=6 UNORDERED_LIST value */ api.FieldBehavior = (function() { var valuesById = {}, values = Object.create(valuesById); @@ -9372,7 +9295,6 @@ values[valuesById[3] = "OUTPUT_ONLY"] = 3; values[valuesById[4] = "INPUT_ONLY"] = 4; values[valuesById[5] = "IMMUTABLE"] = 5; - values[valuesById[6] = "UNORDERED_LIST"] = 6; return values; })(); @@ -14910,7 +14832,6 @@ case 3: case 4: case 5: - case 6: break; } } @@ -15011,10 +14932,6 @@ case 5: message[".google.api.fieldBehavior"][i] = 5; break; - case "UNORDERED_LIST": - case 6: - message[".google.api.fieldBehavior"][i] = 6; - break; } } return message; diff --git a/packages/google-devtools-artifactregistry/protos/protos.json b/packages/google-devtools-artifactregistry/protos/protos.json index e64ade45b26..a2af7b87580 100644 --- a/packages/google-devtools-artifactregistry/protos/protos.json +++ b/packages/google-devtools-artifactregistry/protos/protos.json @@ -951,11 +951,6 @@ "singular": { "type": "string", "id": 6 - }, - "style": { - "rule": "repeated", - "type": "Style", - "id": 10 } }, "nested": { @@ -965,12 +960,6 @@ "ORIGINALLY_SINGLE_PATTERN": 1, "FUTURE_MULTI_PATTERN": 2 } - }, - "Style": { - "values": { - "STYLE_UNSPECIFIED": 0, - "DECLARATIVE_FRIENDLY": 1 - } } } }, @@ -1102,15 +1091,14 @@ "REQUIRED": 2, "OUTPUT_ONLY": 3, "INPUT_ONLY": 4, - "IMMUTABLE": 5, - "UNORDERED_LIST": 6 + "IMMUTABLE": 5 } } } }, "protobuf": { "options": { - "go_package": "google.golang.org/protobuf/types/descriptorpb", + "go_package": "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor", "java_package": "com.google.protobuf", "java_outer_classname": "DescriptorProtos", "csharp_namespace": "Google.Protobuf.Reflection", diff --git a/packages/google-devtools-artifactregistry/src/v1beta2/gapic_metadata.json b/packages/google-devtools-artifactregistry/src/v1beta2/gapic_metadata.json index b45f0c9a9dc..a54983777cf 100644 --- a/packages/google-devtools-artifactregistry/src/v1beta2/gapic_metadata.json +++ b/packages/google-devtools-artifactregistry/src/v1beta2/gapic_metadata.json @@ -3,7 +3,7 @@ "comment": "This file maps proto services/RPCs to the corresponding library clients/methods", "language": "typescript", "protoPackage": "google.devtools.artifactregistry.v1beta2", - "libraryPackage": "artifactregistry", + "libraryPackage": "@google-cloud/artifact-registry", "services": { "ArtifactRegistry": { "clients": { diff --git a/packages/google-devtools-artifactregistry/synth.metadata b/packages/google-devtools-artifactregistry/synth.metadata index 3d8de3047e8..716cd1120b6 100644 --- a/packages/google-devtools-artifactregistry/synth.metadata +++ b/packages/google-devtools-artifactregistry/synth.metadata @@ -3,23 +3,23 @@ { "git": { "name": ".", - "remote": "https://github.com/googleapis/nodejs-artifact-registry.git", - "sha": "b33d4661cea3deae6e625c3b69faac179307aaa4" + "remote": "git@github.com:googleapis/nodejs-artifact-registry.git", + "sha": "d26e985a0d54a8ef51ce1d862d71007588a6fd9b" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "16e91be3603953bcfc0f87aa369e3eb7d1b2cbaf", - "internalRef": "345608665" + "sha": "80fafbce83f1d95c3616c7b3f50504a4ad251bfd", + "internalRef": "359594504" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "318e351e26ba65b2b3cfa3f61b3b64e3540c3525" + "sha": "8c5628b86cfa8386de7b8fc1675e6b528b552d57" } } ], diff --git a/packages/google-devtools-artifactregistry/system-test/fixtures/sample/src/index.js b/packages/google-devtools-artifactregistry/system-test/fixtures/sample/src/index.js index 94c92dec5c5..e4aa5f03d65 100644 --- a/packages/google-devtools-artifactregistry/system-test/fixtures/sample/src/index.js +++ b/packages/google-devtools-artifactregistry/system-test/fixtures/sample/src/index.js @@ -17,7 +17,7 @@ // ** All changes to this file may be overwritten. ** /* eslint-disable node/no-missing-require, no-unused-vars */ -const artifactregistry = require('artifactregistry'); +const artifactregistry = require('@google-cloud/artifact-registry'); function main() { const artifactRegistryClient = new artifactregistry.ArtifactRegistryClient(); diff --git a/packages/google-devtools-artifactregistry/system-test/fixtures/sample/src/index.ts b/packages/google-devtools-artifactregistry/system-test/fixtures/sample/src/index.ts index feb20d63bb5..246f59936fb 100644 --- a/packages/google-devtools-artifactregistry/system-test/fixtures/sample/src/index.ts +++ b/packages/google-devtools-artifactregistry/system-test/fixtures/sample/src/index.ts @@ -16,7 +16,7 @@ // ** https://github.com/googleapis/gapic-generator-typescript ** // ** All changes to this file may be overwritten. ** -import {ArtifactRegistryClient} from 'artifactregistry'; +import {ArtifactRegistryClient} from '@google-cloud/artifact-registry'; // check that the client class type name can be used function doStuffWithArtifactRegistryClient(client: ArtifactRegistryClient) {