Skip to content

Commit 6732d4d

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
build: update gapic generator to allow individual location mixin generation (#2050)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 638462084 Source-Link: https://togithub.com/googleapis/googleapis/commit/e5d56361fda138e2432f73504c7fd6e1cf4cce14 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/d02b2f9239c3e1de647ef37fb10a5e424aa0b7a5 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZDAyYjJmOTIzOWMzZTFkZTY0N2VmMzdmYjEwYTVlNDI0YWEwYjdhNSJ9
1 parent 672e6d8 commit 6732d4d

16 files changed

+15781
-6506
lines changed

‎dev/protos/admin_v1.json

Lines changed: 11 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2230,7 +2230,6 @@
22302230
"Edition": {
22312231
"values": {
22322232
"EDITION_UNKNOWN": 0,
2233-
"EDITION_LEGACY": 900,
22342233
"EDITION_PROTO2": 998,
22352234
"EDITION_PROTO3": 999,
22362235
"EDITION_2023": 1000,
@@ -2956,10 +2955,6 @@
29562955
"type": "FeatureSet",
29572956
"id": 21
29582957
},
2959-
"featureSupport": {
2960-
"type": "FeatureSupport",
2961-
"id": 22
2962-
},
29632958
"uninterpretedOption": {
29642959
"rule": "repeated",
29652960
"type": "UninterpretedOption",
@@ -3029,26 +3024,6 @@
30293024
"id": 2
30303025
}
30313026
}
3032-
},
3033-
"FeatureSupport": {
3034-
"fields": {
3035-
"editionIntroduced": {
3036-
"type": "Edition",
3037-
"id": 1
3038-
},
3039-
"editionDeprecated": {
3040-
"type": "Edition",
3041-
"id": 2
3042-
},
3043-
"deprecationWarning": {
3044-
"type": "string",
3045-
"id": 3
3046-
},
3047-
"editionRemoved": {
3048-
"type": "Edition",
3049-
"id": 4
3050-
}
3051-
}
30523027
}
30533028
}
30543029
},
@@ -3272,7 +3247,6 @@
32723247
"options": {
32733248
"retention": "RETENTION_RUNTIME",
32743249
"targets": "TARGET_TYPE_FILE",
3275-
"feature_support.edition_introduced": "EDITION_2023",
32763250
"edition_defaults.edition": "EDITION_2023",
32773251
"edition_defaults.value": "EXPLICIT"
32783252
}
@@ -3283,7 +3257,6 @@
32833257
"options": {
32843258
"retention": "RETENTION_RUNTIME",
32853259
"targets": "TARGET_TYPE_FILE",
3286-
"feature_support.edition_introduced": "EDITION_2023",
32873260
"edition_defaults.edition": "EDITION_PROTO3",
32883261
"edition_defaults.value": "OPEN"
32893262
}
@@ -3294,7 +3267,6 @@
32943267
"options": {
32953268
"retention": "RETENTION_RUNTIME",
32963269
"targets": "TARGET_TYPE_FILE",
3297-
"feature_support.edition_introduced": "EDITION_2023",
32983270
"edition_defaults.edition": "EDITION_PROTO3",
32993271
"edition_defaults.value": "PACKED"
33003272
}
@@ -3305,7 +3277,6 @@
33053277
"options": {
33063278
"retention": "RETENTION_RUNTIME",
33073279
"targets": "TARGET_TYPE_FILE",
3308-
"feature_support.edition_introduced": "EDITION_2023",
33093280
"edition_defaults.edition": "EDITION_PROTO3",
33103281
"edition_defaults.value": "VERIFY"
33113282
}
@@ -3316,7 +3287,6 @@
33163287
"options": {
33173288
"retention": "RETENTION_RUNTIME",
33183289
"targets": "TARGET_TYPE_FILE",
3319-
"feature_support.edition_introduced": "EDITION_2023",
33203290
"edition_defaults.edition": "EDITION_PROTO2",
33213291
"edition_defaults.value": "LENGTH_PREFIXED"
33223292
}
@@ -3327,7 +3297,6 @@
33273297
"options": {
33283298
"retention": "RETENTION_RUNTIME",
33293299
"targets": "TARGET_TYPE_FILE",
3330-
"feature_support.edition_introduced": "EDITION_2023",
33313300
"edition_defaults.edition": "EDITION_PROTO3",
33323301
"edition_defaults.value": "ALLOW"
33333302
}
@@ -3336,7 +3305,15 @@
33363305
"extensions": [
33373306
[
33383307
1000,
3339-
9994
3308+
1000
3309+
],
3310+
[
3311+
1001,
3312+
1001
3313+
],
3314+
[
3315+
1002,
3316+
1002
33403317
],
33413318
[
33423319
9995,
@@ -3422,13 +3399,9 @@
34223399
"type": "Edition",
34233400
"id": 3
34243401
},
3425-
"overridableFeatures": {
3426-
"type": "FeatureSet",
3427-
"id": 4
3428-
},
3429-
"fixedFeatures": {
3402+
"features": {
34303403
"type": "FeatureSet",
3431-
"id": 5
3404+
"id": 2
34323405
}
34333406
}
34343407
}

‎dev/protos/firestore_admin_v1_proto_api.d.ts

Lines changed: 5 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -5044,7 +5044,7 @@ export namespace google {
50445044

50455045
/** Edition enum. */
50465046
type Edition =
5047-
"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";
5047+
"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";
50485048

50495049
/** Properties of a FileDescriptorProto. */
50505050
interface IFileDescriptorProto {
@@ -6334,9 +6334,6 @@ export namespace google {
63346334
/** FieldOptions features */
63356335
features?: (google.protobuf.IFeatureSet|null);
63366336

6337-
/** FieldOptions featureSupport */
6338-
featureSupport?: (google.protobuf.FieldOptions.IFeatureSupport|null);
6339-
63406337
/** FieldOptions uninterpretedOption */
63416338
uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null);
63426339

@@ -6392,9 +6389,6 @@ export namespace google {
63926389
/** FieldOptions features. */
63936390
public features?: (google.protobuf.IFeatureSet|null);
63946391

6395-
/** FieldOptions featureSupport. */
6396-
public featureSupport?: (google.protobuf.FieldOptions.IFeatureSupport|null);
6397-
63986392
/** FieldOptions uninterpretedOption. */
63996393
public uninterpretedOption: google.protobuf.IUninterpretedOption[];
64006394

@@ -6498,72 +6492,6 @@ export namespace google {
64986492
*/
64996493
public static getTypeUrl(typeUrlPrefix?: string): string;
65006494
}
6501-
6502-
/** Properties of a FeatureSupport. */
6503-
interface IFeatureSupport {
6504-
6505-
/** FeatureSupport editionIntroduced */
6506-
editionIntroduced?: (google.protobuf.Edition|null);
6507-
6508-
/** FeatureSupport editionDeprecated */
6509-
editionDeprecated?: (google.protobuf.Edition|null);
6510-
6511-
/** FeatureSupport deprecationWarning */
6512-
deprecationWarning?: (string|null);
6513-
6514-
/** FeatureSupport editionRemoved */
6515-
editionRemoved?: (google.protobuf.Edition|null);
6516-
}
6517-
6518-
/** Represents a FeatureSupport. */
6519-
class FeatureSupport implements IFeatureSupport {
6520-
6521-
/**
6522-
* Constructs a new FeatureSupport.
6523-
* @param [properties] Properties to set
6524-
*/
6525-
constructor(properties?: google.protobuf.FieldOptions.IFeatureSupport);
6526-
6527-
/** FeatureSupport editionIntroduced. */
6528-
public editionIntroduced: google.protobuf.Edition;
6529-
6530-
/** FeatureSupport editionDeprecated. */
6531-
public editionDeprecated: google.protobuf.Edition;
6532-
6533-
/** FeatureSupport deprecationWarning. */
6534-
public deprecationWarning: string;
6535-
6536-
/** FeatureSupport editionRemoved. */
6537-
public editionRemoved: google.protobuf.Edition;
6538-
6539-
/**
6540-
* Creates a FeatureSupport message from a plain object. Also converts values to their respective internal types.
6541-
* @param object Plain object
6542-
* @returns FeatureSupport
6543-
*/
6544-
public static fromObject(object: { [k: string]: any }): google.protobuf.FieldOptions.FeatureSupport;
6545-
6546-
/**
6547-
* Creates a plain object from a FeatureSupport message. Also converts values to other types if specified.
6548-
* @param message FeatureSupport
6549-
* @param [options] Conversion options
6550-
* @returns Plain object
6551-
*/
6552-
public static toObject(message: google.protobuf.FieldOptions.FeatureSupport, options?: $protobuf.IConversionOptions): { [k: string]: any };
6553-
6554-
/**
6555-
* Converts this FeatureSupport to JSON.
6556-
* @returns JSON object
6557-
*/
6558-
public toJSON(): { [k: string]: any };
6559-
6560-
/**
6561-
* Gets the default type url for FeatureSupport
6562-
* @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
6563-
* @returns The default type url
6564-
*/
6565-
public static getTypeUrl(typeUrlPrefix?: string): string;
6566-
}
65676495
}
65686496

65696497
/** Properties of an OneofOptions. */
@@ -7223,11 +7151,8 @@ export namespace google {
72237151
/** FeatureSetEditionDefault edition */
72247152
edition?: (google.protobuf.Edition|null);
72257153

7226-
/** FeatureSetEditionDefault overridableFeatures */
7227-
overridableFeatures?: (google.protobuf.IFeatureSet|null);
7228-
7229-
/** FeatureSetEditionDefault fixedFeatures */
7230-
fixedFeatures?: (google.protobuf.IFeatureSet|null);
7154+
/** FeatureSetEditionDefault features */
7155+
features?: (google.protobuf.IFeatureSet|null);
72317156
}
72327157

72337158
/** Represents a FeatureSetEditionDefault. */
@@ -7242,11 +7167,8 @@ export namespace google {
72427167
/** FeatureSetEditionDefault edition. */
72437168
public edition: google.protobuf.Edition;
72447169

7245-
/** FeatureSetEditionDefault overridableFeatures. */
7246-
public overridableFeatures?: (google.protobuf.IFeatureSet|null);
7247-
7248-
/** FeatureSetEditionDefault fixedFeatures. */
7249-
public fixedFeatures?: (google.protobuf.IFeatureSet|null);
7170+
/** FeatureSetEditionDefault features. */
7171+
public features?: (google.protobuf.IFeatureSet|null);
72507172

72517173
/**
72527174
* Creates a FeatureSetEditionDefault message from a plain object. Also converts values to their respective internal types.

0 commit comments

Comments
 (0)