Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update Nodejs generator to send API versions in headers for GAPICs #2041

Merged
merged 3 commits into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 9 additions & 24 deletions dev/protos/admin_v1.json
Original file line number Diff line number Diff line change
Expand Up @@ -2230,6 +2230,7 @@
"Edition": {
"values": {
"EDITION_UNKNOWN": 0,
"EDITION_LEGACY": 900,
"EDITION_PROTO2": 998,
"EDITION_PROTO3": 999,
"EDITION_2023": 1000,
Expand All @@ -2240,13 +2241,7 @@
"EDITION_99998_TEST_ONLY": 99998,
"EDITION_99999_TEST_ONLY": 99999,
"EDITION_MAX": 2147483647
},
"reserved": [
[
900,
900
]
]
}
},
"FileDescriptorProto": {
"fields": {
Expand Down Expand Up @@ -3277,6 +3272,7 @@
"options": {
"retention": "RETENTION_RUNTIME",
"targets": "TARGET_TYPE_FILE",
"feature_support.edition_introduced": "EDITION_2023",
"edition_defaults.edition": "EDITION_2023",
"edition_defaults.value": "EXPLICIT"
}
Expand All @@ -3287,6 +3283,7 @@
"options": {
"retention": "RETENTION_RUNTIME",
"targets": "TARGET_TYPE_FILE",
"feature_support.edition_introduced": "EDITION_2023",
"edition_defaults.edition": "EDITION_PROTO3",
"edition_defaults.value": "OPEN"
}
Expand All @@ -3297,6 +3294,7 @@
"options": {
"retention": "RETENTION_RUNTIME",
"targets": "TARGET_TYPE_FILE",
"feature_support.edition_introduced": "EDITION_2023",
"edition_defaults.edition": "EDITION_PROTO3",
"edition_defaults.value": "PACKED"
}
Expand All @@ -3307,6 +3305,7 @@
"options": {
"retention": "RETENTION_RUNTIME",
"targets": "TARGET_TYPE_FILE",
"feature_support.edition_introduced": "EDITION_2023",
"edition_defaults.edition": "EDITION_PROTO3",
"edition_defaults.value": "VERIFY"
}
Expand All @@ -3317,6 +3316,7 @@
"options": {
"retention": "RETENTION_RUNTIME",
"targets": "TARGET_TYPE_FILE",
"feature_support.edition_introduced": "EDITION_2023",
"edition_defaults.edition": "EDITION_PROTO2",
"edition_defaults.value": "LENGTH_PREFIXED"
}
Expand All @@ -3327,6 +3327,7 @@
"options": {
"retention": "RETENTION_RUNTIME",
"targets": "TARGET_TYPE_FILE",
"feature_support.edition_introduced": "EDITION_2023",
"edition_defaults.edition": "EDITION_PROTO3",
"edition_defaults.value": "ALLOW"
}
Expand All @@ -3335,19 +3336,7 @@
"extensions": [
[
1000,
1000
],
[
1001,
1001
],
[
1002,
1002
],
[
9990,
9990
9994
],
[
9995,
Expand Down Expand Up @@ -3440,10 +3429,6 @@
"fixedFeatures": {
"type": "FeatureSet",
"id": 5
},
"features": {
"type": "FeatureSet",
"id": 2
}
}
}
Expand Down
8 changes: 1 addition & 7 deletions dev/protos/firestore_admin_v1_proto_api.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5044,7 +5044,7 @@ export namespace google {

/** Edition enum. */
type Edition =
"EDITION_UNKNOWN"| "EDITION_PROTO2"| "EDITION_PROTO3"| "EDITION_2023"| "EDITION_2024"| "EDITION_1_TEST_ONLY"| "EDITION_2_TEST_ONLY"| "EDITION_99997_TEST_ONLY"| "EDITION_99998_TEST_ONLY"| "EDITION_99999_TEST_ONLY"| "EDITION_MAX";
"EDITION_UNKNOWN"| "EDITION_LEGACY"| "EDITION_PROTO2"| "EDITION_PROTO3"| "EDITION_2023"| "EDITION_2024"| "EDITION_1_TEST_ONLY"| "EDITION_2_TEST_ONLY"| "EDITION_99997_TEST_ONLY"| "EDITION_99998_TEST_ONLY"| "EDITION_99999_TEST_ONLY"| "EDITION_MAX";

/** Properties of a FileDescriptorProto. */
interface IFileDescriptorProto {
Expand Down Expand Up @@ -7228,9 +7228,6 @@ export namespace google {

/** FeatureSetEditionDefault fixedFeatures */
fixedFeatures?: (google.protobuf.IFeatureSet|null);

/** FeatureSetEditionDefault features */
features?: (google.protobuf.IFeatureSet|null);
}

/** Represents a FeatureSetEditionDefault. */
Expand All @@ -7251,9 +7248,6 @@ export namespace google {
/** FeatureSetEditionDefault fixedFeatures. */
public fixedFeatures?: (google.protobuf.IFeatureSet|null);

/** FeatureSetEditionDefault features. */
public features?: (google.protobuf.IFeatureSet|null);

/**
* Creates a FeatureSetEditionDefault message from a plain object. Also converts values to their respective internal types.
* @param object Plain object
Expand Down
51 changes: 34 additions & 17 deletions dev/protos/firestore_admin_v1_proto_api.js
Original file line number Diff line number Diff line change
Expand Up @@ -11804,6 +11804,7 @@
* @name google.protobuf.Edition
* @enum {string}
* @property {string} EDITION_UNKNOWN=EDITION_UNKNOWN EDITION_UNKNOWN value
* @property {string} EDITION_LEGACY=EDITION_LEGACY EDITION_LEGACY value
* @property {string} EDITION_PROTO2=EDITION_PROTO2 EDITION_PROTO2 value
* @property {string} EDITION_PROTO3=EDITION_PROTO3 EDITION_PROTO3 value
* @property {string} EDITION_2023=EDITION_2023 EDITION_2023 value
Expand All @@ -11818,6 +11819,7 @@
protobuf.Edition = (function() {
var valuesById = {}, values = Object.create(valuesById);
values[valuesById[0] = "EDITION_UNKNOWN"] = "EDITION_UNKNOWN";
values[valuesById[900] = "EDITION_LEGACY"] = "EDITION_LEGACY";
values[valuesById[998] = "EDITION_PROTO2"] = "EDITION_PROTO2";
values[valuesById[999] = "EDITION_PROTO3"] = "EDITION_PROTO3";
values[valuesById[1000] = "EDITION_2023"] = "EDITION_2023";
Expand Down Expand Up @@ -12078,6 +12080,10 @@
case 0:
message.edition = 0;
break;
case "EDITION_LEGACY":
case 900:
message.edition = 900;
break;
case "EDITION_PROTO2":
case 998:
message.edition = 998;
Expand Down Expand Up @@ -15732,6 +15738,10 @@
case 0:
message.edition = 0;
break;
case "EDITION_LEGACY":
case 900:
message.edition = 900;
break;
case "EDITION_PROTO2":
case 998:
message.edition = 998;
Expand Down Expand Up @@ -15913,6 +15923,10 @@
case 0:
message.editionIntroduced = 0;
break;
case "EDITION_LEGACY":
case 900:
message.editionIntroduced = 900;
break;
case "EDITION_PROTO2":
case 998:
message.editionIntroduced = 998;
Expand Down Expand Up @@ -15965,6 +15979,10 @@
case 0:
message.editionDeprecated = 0;
break;
case "EDITION_LEGACY":
case 900:
message.editionDeprecated = 900;
break;
case "EDITION_PROTO2":
case 998:
message.editionDeprecated = 998;
Expand Down Expand Up @@ -16019,6 +16037,10 @@
case 0:
message.editionRemoved = 0;
break;
case "EDITION_LEGACY":
case 900:
message.editionRemoved = 900;
break;
case "EDITION_PROTO2":
case 998:
message.editionRemoved = 998;
Expand Down Expand Up @@ -17824,6 +17846,10 @@
case 0:
message.minimumEdition = 0;
break;
case "EDITION_LEGACY":
case 900:
message.minimumEdition = 900;
break;
case "EDITION_PROTO2":
case 998:
message.minimumEdition = 998;
Expand Down Expand Up @@ -17876,6 +17902,10 @@
case 0:
message.maximumEdition = 0;
break;
case "EDITION_LEGACY":
case 900:
message.maximumEdition = 900;
break;
case "EDITION_PROTO2":
case 998:
message.maximumEdition = 998;
Expand Down Expand Up @@ -17986,7 +18016,6 @@
* @property {google.protobuf.Edition|null} [edition] FeatureSetEditionDefault edition
* @property {google.protobuf.IFeatureSet|null} [overridableFeatures] FeatureSetEditionDefault overridableFeatures
* @property {google.protobuf.IFeatureSet|null} [fixedFeatures] FeatureSetEditionDefault fixedFeatures
* @property {google.protobuf.IFeatureSet|null} [features] FeatureSetEditionDefault features
*/

/**
Expand Down Expand Up @@ -18028,14 +18057,6 @@
*/
FeatureSetEditionDefault.prototype.fixedFeatures = null;

/**
* FeatureSetEditionDefault features.
* @member {google.protobuf.IFeatureSet|null|undefined} features
* @memberof google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault
* @instance
*/
FeatureSetEditionDefault.prototype.features = null;

/**
* Creates a FeatureSetEditionDefault message from a plain object. Also converts values to their respective internal types.
* @function fromObject
Expand All @@ -18059,6 +18080,10 @@
case 0:
message.edition = 0;
break;
case "EDITION_LEGACY":
case 900:
message.edition = 900;
break;
case "EDITION_PROTO2":
case 998:
message.edition = 998;
Expand Down Expand Up @@ -18110,11 +18135,6 @@
throw TypeError(".google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.fixedFeatures: object expected");
message.fixedFeatures = $root.google.protobuf.FeatureSet.fromObject(object.fixedFeatures);
}
if (object.features != null) {
if (typeof object.features !== "object")
throw TypeError(".google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.features: object expected");
message.features = $root.google.protobuf.FeatureSet.fromObject(object.features);
}
return message;
};

Expand All @@ -18132,13 +18152,10 @@
options = {};
var object = {};
if (options.defaults) {
object.features = null;
object.edition = options.enums === String ? "EDITION_UNKNOWN" : 0;
object.overridableFeatures = null;
object.fixedFeatures = null;
}
if (message.features != null && message.hasOwnProperty("features"))
object.features = $root.google.protobuf.FeatureSet.toObject(message.features, options);
if (message.edition != null && message.hasOwnProperty("edition"))
object.edition = options.enums === String ? $root.google.protobuf.Edition[message.edition] === undefined ? message.edition : $root.google.protobuf.Edition[message.edition] : message.edition;
if (message.overridableFeatures != null && message.hasOwnProperty("overridableFeatures"))
Expand Down
8 changes: 1 addition & 7 deletions dev/protos/firestore_v1_proto_api.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@ export namespace google {

/** Edition enum. */
type Edition =
"EDITION_UNKNOWN"| "EDITION_PROTO2"| "EDITION_PROTO3"| "EDITION_2023"| "EDITION_2024"| "EDITION_1_TEST_ONLY"| "EDITION_2_TEST_ONLY"| "EDITION_99997_TEST_ONLY"| "EDITION_99998_TEST_ONLY"| "EDITION_99999_TEST_ONLY"| "EDITION_MAX";
"EDITION_UNKNOWN"| "EDITION_LEGACY"| "EDITION_PROTO2"| "EDITION_PROTO3"| "EDITION_2023"| "EDITION_2024"| "EDITION_1_TEST_ONLY"| "EDITION_2_TEST_ONLY"| "EDITION_99997_TEST_ONLY"| "EDITION_99998_TEST_ONLY"| "EDITION_99999_TEST_ONLY"| "EDITION_MAX";

/** Properties of a FileDescriptorProto. */
interface IFileDescriptorProto {
Expand Down Expand Up @@ -2832,9 +2832,6 @@ export namespace google {

/** FeatureSetEditionDefault fixedFeatures */
fixedFeatures?: (google.protobuf.IFeatureSet|null);

/** FeatureSetEditionDefault features */
features?: (google.protobuf.IFeatureSet|null);
}

/** Represents a FeatureSetEditionDefault. */
Expand All @@ -2855,9 +2852,6 @@ export namespace google {
/** FeatureSetEditionDefault fixedFeatures. */
public fixedFeatures?: (google.protobuf.IFeatureSet|null);

/** FeatureSetEditionDefault features. */
public features?: (google.protobuf.IFeatureSet|null);

/**
* Creates a FeatureSetEditionDefault message from a plain object. Also converts values to their respective internal types.
* @param object Plain object
Expand Down
Loading
Loading