Skip to content
This repository has been archived by the owner on Jun 25, 2024. It is now read-only.

INT-7797: refactor private ca #587

Merged
merged 8 commits into from
Apr 20, 2023
Merged

INT-7797: refactor private ca #587

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f00b2f2
INT-7797: refactor Private CA service
gastonyelmini Apr 19, 2023
0c58e12
Fix import
gastonyelmini Apr 19, 2023
5e8ed97
fix tests
gastonyelmini Apr 20, 2023
8ef4dbf
Add missing permission
gastonyelmini Apr 20, 2023
6023bc7
Remove unused steps
gastonyelmini Apr 20, 2023
4d29ade
Fix double if
gastonyelmini Apr 20, 2023
a5a9ef6
fix requested changes
gastonyelmini Apr 20, 2023
3497a13
remove log
gastonyelmini Apr 20, 2023
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
2 changes: 2 additions & 0 deletions docs/jupiterone.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@ The following entities are created:
| Organization | `google_cloud_organization` | `Organization` |
| Private CA Certificate | `google_privateca_certificate` | `Certificate` |
| Private CA Certificate Authority | `google_privateca_certificate_authority` | `Service` |
| Private CA Pool | `google_privateca_pool` | `Group` |
| Project | `google_cloud_project` | `Account` |
| PubSub Subscription | `google_pubsub_subscription` | `Service` |
| PubSub Topic | `google_pubsub_topic` | `Channel` |
Expand Down Expand Up @@ -560,6 +561,7 @@ The following relationships are created:
| `google_cloud_organization` | **HAS** | `google_cloud_project` |
| `google_privateca_certificate_authority` | **CREATED** | `google_privateca_certificate` |
| `google_privateca_certificate_authority` | **USES** | `google_storage_bucket` |
| `google_privateca_pool` | **HAS** | `google_privateca_certificate_authority` |
| `google_pubsub_subscription` | **USES** | `google_pubsub_topic` |
| `google_pubsub_topic` | **USES** | `google_kms_crypto_key` |
| `google_redis_instance` | **USES** | `google_compute_network` |
Expand Down
40 changes: 29 additions & 11 deletions src/getStepStartStates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,7 @@ import {
import { monitoringSteps } from './steps/monitoring';
import { STEP_MONITORING_ALERT_POLICIES } from './steps/monitoring/constants';
import { privateCaSteps } from './steps/privateca';
import {
STEP_CREATE_PRIVATE_CA_CERTIFICATE_AUTHORITY_BUCKET_RELATIONSHIPS,
STEP_PRIVATE_CA_CERTIFICATES,
STEP_PRIVATE_CA_CERTIFICATE_AUTHORITIES,
} from './steps/privateca/constants';
import { PrivatecaSteps } from './steps/privateca/constants';
import { pubSubSteps } from './steps/pub-sub';
import {
STEP_CREATE_PUBSUB_TOPIC_KMS_RELATIONSHIPS,
Expand Down Expand Up @@ -413,11 +409,24 @@ function getDefaultStepStartStates(params: {
[STEP_API_GATEWAY_APIS]: { disabled: false },
[STEP_API_GATEWAY_API_CONFIGS]: { disabled: false },
[STEP_API_GATEWAY_GATEWAYS]: { disabled: false },
[STEP_PRIVATE_CA_CERTIFICATE_AUTHORITIES]: { disabled: false },
[STEP_CREATE_PRIVATE_CA_CERTIFICATE_AUTHORITY_BUCKET_RELATIONSHIPS]: {
[PrivatecaSteps.STEP_PRIVATE_CA_POOLS.id]: { disabled: false },
[PrivatecaSteps.STEP_PRIVATE_CA_CERTIFICATE_AUTHORITIES.id]: {
disabled: false,
},
[PrivatecaSteps
.STEP_CREATE_PRIVATE_CA_POOL_CERTIFICATE_AUTHORITY_RELATIONSHIPS.id]: {
disabled: false,
},
[PrivatecaSteps
.STEP_CREATE_PRIVATE_CA_CERTIFICATE_AUTHORITY_BUCKET_RELATIONSHIPS.id]: {
disabled: false,
},
[STEP_PRIVATE_CA_CERTIFICATES]: { disabled: false },
[PrivatecaSteps
.STEP_CREATE_PRIVATE_CA_CERTIFICATE_AUTHORITY_CERTIFICATE_RELATIONSHIPS
.id]: {
disabled: false,
},
[PrivatecaSteps.STEP_PRIVATE_CA_CERTIFICATES.id]: { disabled: false },
[STEP_DATAPROC_CLUSTERS]: { disabled: false },
[STEP_DATAPROC_CLUSTER_KMS_RELATIONSHIPS]: { disabled: false },
[STEP_CREATE_CLUSTER_STORAGE_RELATIONSHIPS]: { disabled: false },
Expand Down Expand Up @@ -806,12 +815,21 @@ async function getStepStartStatesUsingServiceEnablements(params: {
[STEP_API_GATEWAY_GATEWAYS]: createStepStartState(
ServiceUsageName.API_GATEWAY,
),
[STEP_PRIVATE_CA_CERTIFICATE_AUTHORITIES]: createStepStartState(
[PrivatecaSteps.STEP_PRIVATE_CA_POOLS.id]: createStepStartState(
ServiceUsageName.PRIVATE_CA,
),
[STEP_CREATE_PRIVATE_CA_CERTIFICATE_AUTHORITY_BUCKET_RELATIONSHIPS]:
[PrivatecaSteps.STEP_PRIVATE_CA_CERTIFICATE_AUTHORITIES.id]:
createStepStartState(ServiceUsageName.PRIVATE_CA),
[PrivatecaSteps
.STEP_CREATE_PRIVATE_CA_POOL_CERTIFICATE_AUTHORITY_RELATIONSHIPS.id]:
createStepStartState(ServiceUsageName.PRIVATE_CA),
[PrivatecaSteps
.STEP_CREATE_PRIVATE_CA_CERTIFICATE_AUTHORITY_BUCKET_RELATIONSHIPS.id]:
createStepStartState(ServiceUsageName.PRIVATE_CA),
[STEP_PRIVATE_CA_CERTIFICATES]: createStepStartState(
[PrivatecaSteps
.STEP_CREATE_PRIVATE_CA_CERTIFICATE_AUTHORITY_CERTIFICATE_RELATIONSHIPS
.id]: createStepStartState(ServiceUsageName.PRIVATE_CA),
[PrivatecaSteps.STEP_PRIVATE_CA_CERTIFICATES.id]: createStepStartState(
ServiceUsageName.PRIVATE_CA,
),
[STEP_DATAPROC_CLUSTERS]: createStepStartState(
Expand Down
23 changes: 15 additions & 8 deletions src/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,7 @@ import {
STEP_MEMCACHE_INSTANCES,
} from './steps/memcache/constants';
import { STEP_MONITORING_ALERT_POLICIES } from './steps/monitoring/constants';
import {
STEP_CREATE_PRIVATE_CA_CERTIFICATE_AUTHORITY_BUCKET_RELATIONSHIPS,
STEP_PRIVATE_CA_CERTIFICATES,
STEP_PRIVATE_CA_CERTIFICATE_AUTHORITIES,
} from './steps/privateca/constants';
import { PrivatecaSteps } from './steps/privateca/constants';
import {
STEP_CREATE_PUBSUB_TOPIC_KMS_RELATIONSHIPS,
STEP_PUBSUB_SUBSCRIPTIONS,
Expand Down Expand Up @@ -477,15 +473,26 @@ describe('#getStepStartStates success', () => {
[STEP_API_GATEWAY_GATEWAYS]: {
disabled: false,
},
[STEP_PRIVATE_CA_CERTIFICATE_AUTHORITIES]: {
[PrivatecaSteps.STEP_PRIVATE_CA_POOLS.id]: { disabled: false },
[PrivatecaSteps.STEP_PRIVATE_CA_CERTIFICATE_AUTHORITIES.id]: {
disabled: false,
},
[STEP_CREATE_PRIVATE_CA_CERTIFICATE_AUTHORITY_BUCKET_RELATIONSHIPS]: {
[PrivatecaSteps
.STEP_CREATE_PRIVATE_CA_POOL_CERTIFICATE_AUTHORITY_RELATIONSHIPS.id]:
{
disabled: false,
},
[PrivatecaSteps
.STEP_CREATE_PRIVATE_CA_CERTIFICATE_AUTHORITY_BUCKET_RELATIONSHIPS
.id]: {
disabled: false,
},
[STEP_PRIVATE_CA_CERTIFICATES]: {
[PrivatecaSteps
.STEP_CREATE_PRIVATE_CA_CERTIFICATE_AUTHORITY_CERTIFICATE_RELATIONSHIPS
.id]: {
disabled: false,
},
[PrivatecaSteps.STEP_PRIVATE_CA_CERTIFICATES.id]: { disabled: false },
[STEP_IAM_BINDINGS]: {
disabled: false,
},
Expand Down
Loading