Skip to content

Commit 3e3ec09

Browse files
james-zhou-inspire11tyler-dunkel
authored andcommitted
feat(clourRouter): add network connection
1 parent adc9819 commit 3e3ec09

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/services/cloudRouter/data.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ const serviceName = 'Cloud Router'
1212
const apiEndpoint = initTestEndpoint(serviceName)
1313

1414
export interface RawGcpCloudRouter extends
15-
Omit<google.cloud.compute.v1.IRouter, 'id' | 'region'> {
15+
Omit<google.cloud.compute.v1.IRouter, 'id' | 'region' | 'network'> {
1616
id: string,
1717
region: string,
1818
projectId: string,
19+
network: string[],
1920
}
2021

2122
export default async ({
@@ -35,12 +36,13 @@ export default async ({
3536
project: projectId,
3637
region,
3738
})
38-
for await (const {id, ...cloudRouter} of cloudRoutersIter) {
39+
for await (const {id, network, ...cloudRouter} of cloudRoutersIter) {
3940
routerData.push({
4041
id: id.toString(),
4142
projectId,
4243
...cloudRouter,
4344
region,
45+
network: [network]
4446
})
4547
}
4648
} catch (error) {

src/services/cloudRouter/format.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ export default ({
103103
kind,
104104
name,
105105
nats,
106-
network,
107106
selfLink,
108107
} = service
109108

@@ -145,7 +144,6 @@ export default ({
145144
kind,
146145
name,
147146
nats: nats?.map(nat => formatNat(nat)) || [],
148-
network,
149147
selfLink,
150148
}
151149
}

src/services/cloudRouter/schema.graphql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ type gcpCloudRouter implements gcpBaseResource
112112
kind: String @search(by: [hash, regexp])
113113
name: String @search(by: [hash, regexp])
114114
nats: [gcpCloudRouterNat],
115-
network: String @search(by: [hash, regexp])
116115
selfLink: String @search(by: [hash, regexp])
117116
network: [gcpNetwork] @hasInverse(field: cloudRouter)
118117
project: [gcpProject] @hasInverse(field: cloudRouter)

src/types/generated.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,8 +693,8 @@ export type GcpCloudRouter = GcpBaseResource & {
693693
kind?: Maybe<Scalars['String']>;
694694
name?: Maybe<Scalars['String']>;
695695
nats?: Maybe<Array<Maybe<GcpCloudRouterNat>>>;
696-
network?: Maybe<Scalars['String']>;
697696
selfLink?: Maybe<Scalars['String']>;
697+
network?: Maybe<Array<Maybe<GcpNetwork>>>;
698698
project?: Maybe<Array<Maybe<GcpProject>>>;
699699
};
700700

@@ -1258,6 +1258,7 @@ export type GcpNetwork = GcpBaseResource & {
12581258
subnet?: Maybe<Array<Maybe<GcpSubnet>>>;
12591259
vmInstance?: Maybe<Array<Maybe<GcpVmInstance>>>;
12601260
vpcConnectors?: Maybe<Array<Maybe<GcpVpcConnector>>>;
1261+
cloudRouter?: Maybe<Array<Maybe<GcpCloudRouter>>>;
12611262
};
12621263

12631264
export type GcpNetworkPeering = {

0 commit comments

Comments
 (0)