Skip to content

chore: add git token support #74

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Nov 13, 2024
Merged

chore: add git token support #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
87 changes: 82 additions & 5 deletions ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"tags": [
"solution",
"enterprise_app",
"ibm_beta",
"security"
"security",
"ibm_created"
],
"keywords": [
"compliance",
Expand Down Expand Up @@ -296,9 +296,44 @@
"key": "existing_secrets_manager_crn",
"required": false,
"type": "string",
"default_value": "",
"default_value": "__NULL__",
"description": "The CRN of an existing Secrets Manager instance"
}
},
{
"key": "autostart",
"required": false,
"type": "boolean",
"default_value": false,
"description": "Set to `true` to automatically run the CI pipeline."
},
{
"key": "create_git_token",
"required": false,
"type": "boolean",
"default_value": false,
"description": "Set to `true` to create a Git Token secret in the speficied Secrets Manager, using the name set in `repo_git_token_secret_name` and the value set in `repo_git_token_secret_value`."
},
{
"key": "repo_git_token_secret_name",
"required": false,
"type": "string",
"default_value": "",
"description": "The name for the Git Token secret in Secrets Manager."
},
{
"key": "repo_git_token_secret_value",
"required": false,
"type": "password",
"default_value": "",
"description": "The value of the Git Token secret that is created if `create_git_token` is set to `true`."
},
{
"key": "repo_group",
"required": false,
"type": "string",
"default_value": "",
"description": "The name of the Git repository owner/group. This setting applies to all all the compliance repositories and sample app."
}
],
"outputs": [
{
Expand Down Expand Up @@ -605,7 +640,49 @@
"default_value": "",
"description": "Name of the Git token secret in the secret provider used for accessing the sample (or bring your own) application repository.",
"required": false
}
},
{
"key": "existing_secrets_manager_crn",
"required": false,
"type": "string",
"default_value": "__NULL__",
"description": "The CRN of an existing Secrets Manager instance"
},
{
"key": "autostart",
"required": false,
"type": "boolean",
"default_value": false,
"description": "Set to `true` to automatically run the CI pipeline."
},
{
"key": "create_git_token",
"required": false,
"type": "boolean",
"default_value": false,
"description": "Set to `true` to create a Git Token secret in the speficied Secrets Manager, using the name set in `repo_git_token_secret_name` and the value set in `repo_git_token_secret_value`."
},
{
"key": "repo_git_token_secret_name",
"required": false,
"type": "string",
"default_value": "",
"description": "The name for the Git Token secret in Secrets Manager."
},
{
"key": "repo_git_token_secret_value",
"required": false,
"type": "password",
"default_value": "",
"description": "The value of the Git Token secret that is created if `create_git_token` is set to `true`."
},
{
"key": "repo_group",
"required": false,
"type": "string",
"default_value": "",
"description": "The name of the Git repository owner/group. This setting applies to all all the compliance repositories and sample app."
}
],
"outputs": [
{
Expand Down
82 changes: 75 additions & 7 deletions kubernetes/stack_definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,54 @@
"hidden": false,
"default": "",
"required": false
},
{
"name": "existing_secrets_manager_crn",
"required": false,
"type": "string",
"hidden": false,
"default": "__NULL__",
"custom_config": {}
},
{
"name": "autostart",
"required": false,
"type": "boolean",
"hidden": false,
"default": false,
"custom_config": {}
},
{
"name": "create_git_token",
"required": false,
"type": "boolean",
"hidden": false,
"default": false,
"custom_config": {}
},
{
"name": "repo_git_token_secret_name",
"required": false,
"type": "string",
"hidden": false,
"default": "",
"custom_config": {}
},
{
"name": "repo_git_token_secret_value",
"required": false,
"type": "password",
"hidden": false,
"default": "",
"custom_config": {}
},
{
"name": "repo_group",
"required": false,
"type": "string",
"hidden": false,
"default": "",
"custom_config": {}
}
],
"members": [
Expand All @@ -221,7 +269,7 @@
}
],
"name": "1 - Key Management",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.58ca29c8-694e-41a8-8beb-866cb24b48e6-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3b5c0ef5-6438-4e7b-8a88-88636bc590c6-global"
},
{
"inputs": [
Expand All @@ -243,7 +291,7 @@
}
],
"name": "2 - Cloud Object Storage",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.48d7439d-aaf6-42a1-bb4d-a73775caf0c2-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.f039fa0e-24f7-4c12-a617-1dee12997859-global"
},
{
"inputs": [
Expand Down Expand Up @@ -307,7 +355,7 @@
}
],
"name": "4 - Event Notifications",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.ef41f37e-25b7-4dc2-89b3-08d38df6789d-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.dfffe742-c7a1-452e-90b1-3080f1f57f78-global"
},
{
"inputs": [
Expand All @@ -327,6 +375,10 @@
"name": "prefix",
"value": "ref:../../inputs/prefix"
},
{
"name": "existing_secrets_manager_crn",
"value": "ref:../../inputs/existing_secrets_manager_crn"
},
{
"name": "existing_kms_instance_crn",
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"
Expand All @@ -341,7 +393,7 @@
}
],
"name": "5 - Secrets Manager",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.03587d2d-38bd-42c3-983b-72469702e038-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.e314e905-ca89-4947-aa94-23d270516f0e-global"
},
{
"inputs": [
Expand Down Expand Up @@ -395,11 +447,11 @@
}
],
"name": "6 - Security and Compliance Center",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.88be4381-4dfe-45ee-a2f9-1d48bb6f300a-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.29b5ef2b-a3c1-4798-9595-ed1263945f82-global"
},
{
"name": "7 - DevSecOps Toolchains",
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.d0d2aff1-8f34-4fa8-bc00-92378edd2226-global",
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.7721322c-d795-4e44-b9a9-e10ee1565a06-global",
"inputs": [
{
"name": "ibmcloud_api_key",
Expand Down Expand Up @@ -451,7 +503,7 @@
},
{
"name": "autostart",
"value": "true"
"value": "ref:../../inputs/autostart"
},
{
"name": "prefix",
Expand Down Expand Up @@ -528,6 +580,22 @@
{
"name": "add_container_name_suffix",
"value": "true"
},
{
"name": "create_git_token",
"value": "ref:../../inputs/create_git_token"
},
{
"name": "repo_git_token_secret_name",
"value": "ref:../../inputs/repo_git_token_secret_name"
},
{
"name": "repo_git_token_secret_value",
"value": "ref:../../inputs/repo_git_token_secret_value"
},
{
"name": "repo_group",
"value": "ref:../../inputs/repo_git_token_secret_value"
}
]
}
Expand Down
74 changes: 65 additions & 9 deletions stack_definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,46 @@
"hidden": false,
"default": "__NULL__",
"custom_config": {}
},
{
"name": "autostart",
"required": false,
"type": "boolean",
"hidden": false,
"default": false,
"custom_config": {}
},
{
"name": "create_git_token",
"required": false,
"type": "boolean",
"hidden": false,
"default": false,
"custom_config": {}
},
{
"name": "repo_git_token_secret_name",
"required": false,
"type": "string",
"hidden": false,
"default": "",
"custom_config": {}
},
{
"name": "repo_git_token_secret_value",
"required": false,
"type": "password",
"hidden": false,
"default": "",
"custom_config": {}
},
{
"name": "repo_group",
"required": false,
"type": "string",
"hidden": false,
"default": "",
"custom_config": {}
}
],
"members": [
Expand All @@ -184,7 +224,7 @@
}
],
"name": "1 - Key Management",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.58ca29c8-694e-41a8-8beb-866cb24b48e6-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3b5c0ef5-6438-4e7b-8a88-88636bc590c6-global"
},
{
"inputs": [
Expand All @@ -206,7 +246,7 @@
}
],
"name": "2 - Cloud Object Storage",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.48d7439d-aaf6-42a1-bb4d-a73775caf0c2-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.f039fa0e-24f7-4c12-a617-1dee12997859-global"
},
{
"inputs": [
Expand Down Expand Up @@ -270,7 +310,7 @@
}
],
"name": "4 - Event Notifications",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.ef41f37e-25b7-4dc2-89b3-08d38df6789d-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.dfffe742-c7a1-452e-90b1-3080f1f57f78-global"
},
{
"inputs": [
Expand Down Expand Up @@ -308,7 +348,7 @@
}
],
"name": "5 - Secrets Manager",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.03587d2d-38bd-42c3-983b-72469702e038-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.e314e905-ca89-4947-aa94-23d270516f0e-global"
},
{
"inputs": [
Expand Down Expand Up @@ -362,7 +402,7 @@
}
],
"name": "6 - Security and Compliance Center",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.88be4381-4dfe-45ee-a2f9-1d48bb6f300a-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.29b5ef2b-a3c1-4798-9595-ed1263945f82-global"
},
{
"inputs": [
Expand All @@ -388,7 +428,7 @@
},
{
"name": "8 - DevSecOps Toolchains",
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.72e3b0a3-9d6c-4b85-be2c-baed5a5ac732-global",
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.4efc4831-c0ce-4c27-8f88-021d5985e7f5-global",
"inputs": [
{
"name": "ibmcloud_api_key",
Expand Down Expand Up @@ -439,9 +479,9 @@
"value": "ref:../../inputs/registry_namespace"
},
{
"name": "autostart",
"value": "true"
},
"name": "autostart",
"value": "ref:../../inputs/autostart"
},
{
"name": "prefix",
"value": "ref:../../inputs/prefix"
Expand Down Expand Up @@ -497,6 +537,22 @@
{
"name": "cd_code_engine_project",
"value": "ref:../../members/7 - Code Engine Project/outputs/project_1_name"
},
{
"name": "create_git_token",
"value": "ref:../../inputs/create_git_token"
},
{
"name": "repo_git_token_secret_name",
"value": "ref:../../inputs/repo_git_token_secret_name"
},
{
"name": "repo_git_token_secret_value",
"value": "ref:../../inputs/repo_git_token_secret_value"
},
{
"name": "repo_group",
"value": "ref:../../inputs/repo_git_token_secret_value"
}
]
}
Expand Down