Skip to content

Commit 1cd7796

Browse files
hjaraujofhjaraujof
authored
Merge pull request #8 from cloudgraphdev/alpha
Beta release
2 parents 25385c0 + 512c23f commit 1cd7796

19 files changed

Lines changed: 3946 additions & 4212 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,38 @@
1+
# [0.35.0-alpha.3](https://github.com/cloudgraphdev/cloudgraph-provider-gcp/compare/0.35.0-alpha.2...0.35.0-alpha.3) (2022-11-28)
2+
3+
4+
### Bug Fixes
5+
6+
* cve vulnerabilities remediations ([ce7dd8f](https://github.com/cloudgraphdev/cloudgraph-provider-gcp/commit/ce7dd8f481f2ad3d86723ccae44ceaf31b3cd9a8))
7+
8+
# [0.35.0-alpha.2](https://github.com/cloudgraphdev/cloudgraph-provider-gcp/compare/0.35.0-alpha.1...0.35.0-alpha.2) (2022-08-08)
9+
10+
11+
### Bug Fixes
12+
13+
* **service:** Fix days ago value changed for test purposes ([841458c](https://github.com/cloudgraphdev/cloudgraph-provider-gcp/commit/841458c5ff3b80958a02f5813ca5902342ac02eb))
14+
15+
# [0.35.0-alpha.1](https://github.com/cloudgraphdev/cloudgraph-provider-gcp/compare/0.34.2-alpha.2...0.35.0-alpha.1) (2022-08-05)
16+
17+
18+
### Features
19+
20+
* **service:** Added GCP Billing service ([3a457f9](https://github.com/cloudgraphdev/cloudgraph-provider-gcp/commit/3a457f9d4e0418e36214fcbd1c90e9c6d226a4b0))
21+
22+
## [0.34.2-alpha.2](https://github.com/cloudgraphdev/cloudgraph-provider-gcp/compare/0.34.2-alpha.1...0.34.2-alpha.2) (2022-07-27)
23+
24+
25+
### Bug Fixes
26+
27+
* computeProject unknown field _reportNamePrefix ([0c7560e](https://github.com/cloudgraphdev/cloudgraph-provider-gcp/commit/0c7560ebe0ffa69d56635abddb5b51328cf98f35))
28+
29+
## [0.34.2-alpha.1](https://github.com/cloudgraphdev/cloudgraph-provider-gcp/compare/0.34.1...0.34.2-alpha.1) (2022-06-17)
30+
31+
32+
### Bug Fixes
33+
34+
* **bigQuery:** add labels in bigQueryDataset ([357524f](https://github.com/cloudgraphdev/cloudgraph-provider-gcp/commit/357524f7865036954906419c735a8a4daf71e10c))
35+
136
## [0.34.1](https://gitlab.com/auto-cloud/cloudgraph/provider/cloudgraph-provider-gcp/compare/0.34.0...0.34.1) (2022-03-24)
237

338

‎package.json‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cloudgraph/cg-provider-gcp",
3-
"version": "0.34.1",
3+
"version": "0.35.0-alpha.3",
44
"description": "CloudGraph provider plugin for GCP used to fetch GCP cloud data.",
55
"publishConfig": {
66
"registry": "https://registry.npmjs.org/",
@@ -31,7 +31,7 @@
3131
"terraform:cleanup": "rimraf ./tests/terraform/{.terraform,.terraform.lock.hcl,tfplan} ./tests/terraform/*.{tfstate,tfplan,backup}"
3232
},
3333
"dependencies": {
34-
"@cloudgraph/sdk": "^0.11.0",
34+
"@cloudgraph/sdk": "0.22.1",
3535
"@google-cloud/api-gateway": "^1.2.1",
3636
"@google-cloud/asset": "^3.22.0",
3737
"@google-cloud/bigquery": "^5.10.0",
@@ -52,8 +52,8 @@
5252
"@google-cloud/secret-manager": "^3.10.1",
5353
"@google-cloud/storage": "^5.16.1",
5454
"@google-cloud/vpc-access": "^1.1.2",
55-
"@graphql-tools/load-files": "6.3.2",
56-
"@graphql-tools/merge": "8.0.1",
55+
"@graphql-tools/load-files": "^6.5.3",
56+
"@graphql-tools/merge": "^8.2.3",
5757
"chalk": "4.1.2",
5858
"cuid": "2.1.8",
5959
"dotenv": "10.0.0",
@@ -64,13 +64,13 @@
6464
},
6565
"devDependencies": {
6666
"@autocloud/eslint-config": "^0.1.0",
67-
"@graphql-codegen/cli": "2.4.0",
68-
"@graphql-codegen/typescript": "2.4.2",
67+
"@graphql-codegen/cli": "^2.5.0",
68+
"@graphql-codegen/typescript": "^2.4.3",
6969
"@semantic-release/changelog": "^6.0.1",
7070
"@semantic-release/git": "^10.0.1",
7171
"@semantic-release/github": "^8.0.1",
7272
"@semantic-release/npm": "^9.0.1",
73-
"@types/jest": "^26.0.24",
73+
"@types/jest": "^27.0.0",
7474
"@types/lodash": "^4.14.170",
7575
"@types/node": "^15.12.4",
7676
"@types/node-fetch": "^2.5.5",
@@ -82,18 +82,23 @@
8282
"eslint-config-prettier": "^6.11.0",
8383
"eslint-plugin-import": "^2.22.1",
8484
"eslint-plugin-prettier": "^3.4.0",
85-
"husky": "^7.0.0",
85+
"husky": "^8.0.2",
8686
"jest": "^27.0.6",
8787
"lint-staged": "^11.1.1",
8888
"prettier": "^2.3.2",
8989
"semantic-release": "^19.0.2",
90-
"shx": "^0.3.3",
91-
"ts-jest": "^27.0.4"
90+
"shx": "^0.3.4",
91+
"ts-jest": "^27.1.5"
9292
},
9393
"lint-staged": {
9494
"*.{ts,graphql,json}": [
9595
"yarn lint:fix",
9696
"git add --force"
9797
]
98+
},
99+
"resolutions": {
100+
"**/braces": "^2.3.1",
101+
"**/glob-parent": "^5.1.2",
102+
"**/uri-js": "^3.0.1"
98103
}
99-
}
104+
}

‎src/enums/schemasMap.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export default {
1212
[services.bigQueryReservationCapacityCommitment]: 'gcpBigQueryReservationCapacityCommitment',
1313
[services.bigQueryDataTransfer]: 'gcpBigQueryDataTransfer',
1414
[services.bigQueryDataTransferRun]: 'gcpBigQueryDataTransferRun',
15+
[services.billing]: 'gcpBilling',
1516
[services.kmsKeyRing]: 'gcpKmsKeyRing',
1617
[services.kmsCryptoKeys]: 'gcpKmsCryptoKey',
1718
[services.cdnBackendBucket]: 'gcpCdnBackendBucket',

‎src/enums/serviceMap.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ import GcpApiGatewayApiConfig from '../services/apiGatewayApiConfig'
4949
import GcpFirestoreDatabase from '../services/firestore'
5050
import GcpLabel from '../services/label'
5151
import GcpTag from '../services/tag'
52+
import GcpBilling from '../services/billing'
5253

5354
/**
5455
* serviceMap is an object that contains all currently supported services
@@ -63,6 +64,7 @@ export default {
6364
[services.bigQueryReservationCapacityCommitment]: GcpBigQueryReservationCapacityCommitment,
6465
[services.bigQueryDataTransfer]: GcpBigQueryDataTransfer,
6566
[services.bigQueryDataTransferRun]: GcpBigQueryDataTransferRun,
67+
[services.billing]: GcpBilling,
6668
[services.kmsKeyRing]: GcpKmsKeyRing,
6769
[services.kmsCryptoKeys]: GcpKmsCryptoKey,
6870
[services.cloudRouter]: GcpCloudRouter,

‎src/enums/services.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default {
1616
// recommender: 'recommender',
1717
// services: 'services',
1818
// anthos: 'anthos',
19-
// billing: 'billing',
19+
billing: 'billing',
2020
// artifacts: 'artifacts',
2121
// builds: 'builds',
2222
// scheduler: 'scheduler',

‎src/properties/logger.ts‎

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,48 @@
11
export default {
22
platform: 'Platform: GCP',
3-
fetchingResourceData: (resource: string): string => `Fetching ${resource} data...`,
3+
fetchingResourceData: (resource: string): string =>
4+
`Fetching ${resource} data...`,
45
doneFetchingResourceData: (resource: string, num: number): string =>
56
`✅ Done fetching ${resource} data in ${num}s ✅`,
6-
foundResources: (resource: string, num: number): string => `Found ${num} ${resource}`,
7+
foundResources: (resource: string, num: number): string =>
8+
`Found ${num} ${resource}`,
79
lookingForResourcesAddToRegion: (region: string, resource: string): string =>
810
`Looking for ${resource} to add to Region ${region}...`,
9-
addingServiceToRegion: (region: string, resource: string, num: number): string =>
10-
`Adding ${num} ${resource} to Region ${region}`,
11+
addingServiceToRegion: (
12+
region: string,
13+
resource: string,
14+
num: number
15+
): string => `Adding ${num} ${resource} to Region ${region}`,
1116
lookingForResourcesAddToProject: (resource: string): string =>
1217
`Looking for ${resource} to add to the Project...`,
1318
addingServiceToProject: (resource: string, num: number): string =>
1419
`Adding ${num} ${resource} to the Project`,
1520
/**
16-
* VPC
17-
*/
21+
* VPC
22+
*/
1823
foundVpcs: (num: number): string => `Found ${num} VPCs`,
1924
/**
20-
* IAM
21-
*/
25+
* IAM
26+
*/
2227
foundPolicies: (num: number): string => `Found ${num} IAM Policies`,
2328
/**
24-
* Logging
25-
*/
29+
* Logging
30+
*/
2631
foundLogBuckets: (num: number): string => `Found ${num} Log Buckets`,
2732
foundLogSinks: (num: number): string => `Found ${num} Log Sinks`,
28-
foundLogViews: (num: number): string => `Found ${num} Log Views`
33+
foundLogViews: (num: number): string => `Found ${num} Log Views`,
34+
/**
35+
* Billing
36+
*/
37+
fetchingAggregateFinOpsData:
38+
'Fetching aggregate FinOps data for this GCP account via the Azure SDK...',
39+
unableToFindFinOpsAggregateData:
40+
'❌ Unable to get billing data for this GCP account, billing data was missing. ❌',
41+
queryingAggregateFinOpsDataForRegion: (
42+
region: string,
43+
type: string
44+
): string =>
45+
`Querying aggregate FinOps data for the ${region} region using the ${type} method...`,
46+
doneFetchingAggregateFinOpsData: (num: number): string =>
47+
`🕒 Done fetching aggregate FinOps data in ${num} 🕘`,
2948
}

‎src/services/bigQuery/schema.graphql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ type gcpBigQueryDataset implements gcpBaseResource
136136
defaultPartitionExpirationMs: String @search(by: [hash, regexp])
137137
access: [gcpBigQueryDatasetAccess]
138138
creationTime: String @search(by: [hash, regexp])
139+
labels: [gcpRawLabel]
139140
lastModifiedTime: String @search(by: [hash, regexp])
140141
location: String @search(by: [hash, regexp])
141142
defaultEncryptionConfiguration: gcpBigQueryEncryptionConfiguration

0 commit comments

Comments
 (0)