Skip to content
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

Jump to bottom

Additional CD Toolchain changes for GA #4145

Merged
merged 4 commits into from
Nov 10, 2022
Merged

Additional CD Toolchain changes for GA #4145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e4e129
Doc updates. Rename project_id to repo_id
gmarjoram Nov 7, 2022
6a3acb5
More doc updates
gmarjoram Nov 7, 2022
2458179
Merge remote-tracking branch 'upstream/master' into toolchain_ga
gmarjoram Nov 8, 2022
c3b40c6
Update example
gmarjoram Nov 8, 2022
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: 1 addition & 1 deletion examples/ibm-cd-toolchain-simple-helm/integrations/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = ">=1.46.0"
version = ">=1.48.0"
}
}
}
2 changes: 1 addition & 1 deletion examples/ibm-cd-toolchain-simple-helm/pipeline-ci/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = ">=1.46.0"
version = ">=1.48.0"
}
}
}
2 changes: 1 addition & 1 deletion examples/ibm-cd-toolchain-simple-helm/pipeline-pr/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = ">=1.46.0"
version = ">=1.48.0"
}
}
}
6 changes: 3 additions & 3 deletions examples/ibm-cd-toolchain-simple-helm/repositories/repositories.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ resource "ibm_cd_toolchain_tool_hostedgit" "app_repo" {
toolchain_id = var.toolchain_id
name = "repo"
initialization {
type = "clone"
type = "clone_if_not_exists"
source_repo_url = var.app_repo
private_repo = true
repo_name = join("-", [ var.repositories_prefix, "app-repo" ])
Expand All @@ -17,7 +17,7 @@ resource "ibm_cd_toolchain_tool_hostedgit" "pipeline_repo" {
toolchain_id = var.toolchain_id
name = "pipeline-repo"
initialization {
type = "clone"
type = "clone_if_not_exists"
repo_url = var.pipeline_repo
private_repo = true
repo_name = join("-", [ var.repositories_prefix, "pipeline-repo" ])
Expand All @@ -32,7 +32,7 @@ resource "ibm_cd_toolchain_tool_hostedgit" "tekton_tasks_catalog_repo" {
toolchain_id = var.toolchain_id
name = "tasks-repo"
initialization {
type = "clone"
type = "clone_if_not_exists"
repo_url = var.tekton_tasks_catalog_repo
private_repo = true
repo_name = join("-", [ var.repositories_prefix, "tasks-repo" ])
Expand Down
2 changes: 1 addition & 1 deletion examples/ibm-cd-toolchain-simple-helm/repositories/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = ">=1.46.0"
version = ">=1.48.0"
}
}
}
2 changes: 1 addition & 1 deletion examples/ibm-cd-toolchain-simple-helm/services/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = ">=1.46.0"
version = ">=1.48.0"
}
}
}
2 changes: 1 addition & 1 deletion examples/ibm-cd-toolchain-simple-helm/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = ">=1.46.0"
version = ">=1.48.0"
}
}
}
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/data_source_ibm_cd_toolchain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func DataSourceIBMCdToolchain() *schema.Resource {
"resource_group_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "Resource group where the toolchain can be found.",
Description: "Resource group where the toolchain is located.",
},
"crn": &schema.Schema{
Type: schema.TypeString,
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/data_source_ibm_cd_toolchain_tool_appconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func DataSourceIBMCdToolchainToolAppconfig() *schema.Resource {
"resource_group_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "Resource group where the tool can be found.",
Description: "Resource group where the tool is located.",
},
"crn": &schema.Schema{
Type: schema.TypeString,
Expand Down
8 changes: 4 additions & 4 deletions ibm/service/cdtoolchain/data_source_ibm_cd_toolchain_tool_artifactory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func DataSourceIBMCdToolchainToolArtifactory() *schema.Resource {
"resource_group_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "Resource group where the tool can be found.",
Description: "Resource group where the tool is located.",
},
"crn": &schema.Schema{
Type: schema.TypeString,
Expand Down Expand Up @@ -124,18 +124,18 @@ func DataSourceIBMCdToolchainToolArtifactory() *schema.Resource {
"repository_name": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "The name of your artifactory repository where your docker images are located.",
Description: "The name of your Artifactory repository where your docker images are located.",
},
"repository_url": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "The URL of your artifactory repository where your docker images are located.",
Description: "The URL of your Artifactory repository where your docker images are located.",
},
"api_key": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Sensitive: true,
Description: "The Artifactory API key for your Artifactory repository.",
Description: "The Artifactory API key for your Artifactory repository. You can use a toolchain secret reference for this parameter. For more information, see [Protecting your sensitive data in Continuous Delivery](https://cloud.ibm.com/docs/ContinuousDelivery?topic=ContinuousDelivery-cd_data_security#cd_secure_credentials).",
},
},
},
Expand Down
6 changes: 3 additions & 3 deletions ibm/service/cdtoolchain/data_source_ibm_cd_toolchain_tool_bitbucketgit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func DataSourceIBMCdToolchainToolBitbucketgit() *schema.Resource {
"resource_group_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "Resource group where the tool can be found.",
Description: "Resource group where the tool is located.",
},
"crn": &schema.Schema{
Type: schema.TypeString,
Expand Down Expand Up @@ -146,10 +146,10 @@ func DataSourceIBMCdToolchainToolBitbucketgit() *schema.Resource {
Computed: true,
Description: "Select the user which git operations will be performed as.",
},
"project_id": &schema.Schema{
"repo_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "The ID of the project.",
Description: "The ID of the Bitbucket repository.",
},
"toolchain_issues_enabled": &schema.Schema{
Type: schema.TypeBool,
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/data_source_ibm_cd_toolchain_tool_custom.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func DataSourceIBMCdToolchainToolCustom() *schema.Resource {
"resource_group_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "Resource group where the tool can be found.",
Description: "Resource group where the tool is located.",
},
"crn": &schema.Schema{
Type: schema.TypeString,
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/data_source_ibm_cd_toolchain_tool_devopsinsights.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func DataSourceIBMCdToolchainToolDevopsinsights() *schema.Resource {
"resource_group_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "Resource group where the tool can be found.",
Description: "Resource group where the tool is located.",
},
"crn": &schema.Schema{
Type: schema.TypeString,
Expand Down
6 changes: 3 additions & 3 deletions ibm/service/cdtoolchain/data_source_ibm_cd_toolchain_tool_githubconsolidated.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func DataSourceIBMCdToolchainToolGithubconsolidated() *schema.Resource {
"resource_group_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "Resource group where the tool can be found.",
Description: "Resource group where the tool is located.",
},
"crn": &schema.Schema{
Type: schema.TypeString,
Expand Down Expand Up @@ -151,10 +151,10 @@ func DataSourceIBMCdToolchainToolGithubconsolidated() *schema.Resource {
Computed: true,
Description: "Select the user which git operations will be performed as.",
},
"project_id": &schema.Schema{
"repo_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "The ID of the project.",
Description: "The ID of the GitHub repository.",
},
"toolchain_issues_enabled": &schema.Schema{
Type: schema.TypeBool,
Expand Down
6 changes: 3 additions & 3 deletions ibm/service/cdtoolchain/data_source_ibm_cd_toolchain_tool_gitlab.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func DataSourceIBMCdToolchainToolGitlab() *schema.Resource {
"resource_group_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "Resource group where the tool can be found.",
Description: "Resource group where the tool is located.",
},
"crn": &schema.Schema{
Type: schema.TypeString,
Expand Down Expand Up @@ -146,10 +146,10 @@ func DataSourceIBMCdToolchainToolGitlab() *schema.Resource {
Computed: true,
Description: "Select the user which git operations will be performed as.",
},
"project_id": &schema.Schema{
"repo_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "The ID of the project.",
Description: "The ID of the GitLab project.",
},
"toolchain_issues_enabled": &schema.Schema{
Type: schema.TypeBool,
Expand Down
10 changes: 5 additions & 5 deletions ibm/service/cdtoolchain/data_source_ibm_cd_toolchain_tool_hashicorpvault.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func DataSourceIBMCdToolchainToolHashicorpvault() *schema.Resource {
"resource_group_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "Resource group where the tool can be found.",
Description: "Resource group where the tool is located.",
},
"crn": &schema.Schema{
Type: schema.TypeString,
Expand Down Expand Up @@ -105,19 +105,19 @@ func DataSourceIBMCdToolchainToolHashicorpvault() *schema.Resource {
Type: schema.TypeString,
Computed: true,
Sensitive: true,
Description: "The authentication token for your HashiCorp Vault instance when using the 'github' and 'token' authentication methods. This parameter is ignored for other authentication methods.",
Description: "The authentication token for your HashiCorp Vault instance when using the 'github' and 'token' authentication methods. This parameter is ignored for other authentication methods. You can use a toolchain secret reference for this parameter. For more information, see [Protecting your sensitive data in Continuous Delivery](https://cloud.ibm.com/docs/ContinuousDelivery?topic=ContinuousDelivery-cd_data_security#cd_secure_credentials).",
},
"role_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Sensitive: true,
Description: "The authentication role ID for your HashiCorp Vault instance when using the 'approle' authentication method. This parameter is ignored for other authentication methods. Note, 'role_id' should be treated as a secret and should not be shared in plaintext.",
Description: "The authentication role ID for your HashiCorp Vault instance when using the 'approle' authentication method. This parameter is ignored for other authentication methods. Note, 'role_id' should be treated as a secret and should not be shared in plaintext. You can use a toolchain secret reference for this parameter. For more information, see [Protecting your sensitive data in Continuous Delivery](https://cloud.ibm.com/docs/ContinuousDelivery?topic=ContinuousDelivery-cd_data_security#cd_secure_credentials).",
},
"secret_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Sensitive: true,
Description: "The authentication secret ID for your HashiCorp Vault instance when using the 'approle' authentication method. This parameter is ignored for other authentication methods.",
Description: "The authentication secret ID for your HashiCorp Vault instance when using the 'approle' authentication method. This parameter is ignored for other authentication methods. You can use a toolchain secret reference for this parameter. For more information, see [Protecting your sensitive data in Continuous Delivery](https://cloud.ibm.com/docs/ContinuousDelivery?topic=ContinuousDelivery-cd_data_security#cd_secure_credentials).",
},
"dashboard_url": &schema.Schema{
Type: schema.TypeString,
Expand Down Expand Up @@ -148,7 +148,7 @@ func DataSourceIBMCdToolchainToolHashicorpvault() *schema.Resource {
Type: schema.TypeString,
Computed: true,
Sensitive: true,
Description: "The authentication password for your HashiCorp Vault instance when using the 'userpass' authentication method. This parameter is ignored for other authentication methods.",
Description: "The authentication password for your HashiCorp Vault instance when using the 'userpass' authentication method. This parameter is ignored for other authentication methods. You can use a toolchain secret reference for this parameter. For more information, see [Protecting your sensitive data in Continuous Delivery](https://cloud.ibm.com/docs/ContinuousDelivery?topic=ContinuousDelivery-cd_data_security#cd_secure_credentials).",
},
},
},
Expand Down
6 changes: 3 additions & 3 deletions ibm/service/cdtoolchain/data_source_ibm_cd_toolchain_tool_hostedgit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func DataSourceIBMCdToolchainToolHostedgit() *schema.Resource {
"resource_group_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "Resource group where the tool can be found.",
Description: "Resource group where the tool is located.",
},
"crn": &schema.Schema{
Type: schema.TypeString,
Expand Down Expand Up @@ -146,10 +146,10 @@ func DataSourceIBMCdToolchainToolHostedgit() *schema.Resource {
Computed: true,
Description: "Select the user which git operations will be performed as.",
},
"project_id": &schema.Schema{
"repo_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "The ID of the project.",
Description: "The ID of the Git Repos and Issue Tracking project.",
},
"toolchain_issues_enabled": &schema.Schema{
Type: schema.TypeBool,
Expand Down
5 changes: 3 additions & 2 deletions ibm/service/cdtoolchain/data_source_ibm_cd_toolchain_tool_jenkins.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func DataSourceIBMCdToolchainToolJenkins() *schema.Resource {
"resource_group_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "Resource group where the tool can be found.",
Description: "Resource group where the tool is located.",
},
"crn": &schema.Schema{
Type: schema.TypeString,
Expand Down Expand Up @@ -99,6 +99,7 @@ func DataSourceIBMCdToolchainToolJenkins() *schema.Resource {
"webhook_url": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Sensitive: true,
Description: "The webhook to use in your Jenkins jobs to send notifications to other tools in your toolchain.",
},
"api_user_name": &schema.Schema{
Expand All @@ -110,7 +111,7 @@ func DataSourceIBMCdToolchainToolJenkins() *schema.Resource {
Type: schema.TypeString,
Computed: true,
Sensitive: true,
Description: "The API token to use for Jenkins REST API calls so that DevOps Insights can collect data from Jenkins. You can find the API token on the configuration page of your Jenkins instance.",
Description: "The API token to use for Jenkins REST API calls so that DevOps Insights can collect data from Jenkins. You can find the API token on the configuration page of your Jenkins instance. You can use a toolchain secret reference for this parameter. For more information, see [Protecting your sensitive data in Continuous Delivery](https://cloud.ibm.com/docs/ContinuousDelivery?topic=ContinuousDelivery-cd_data_security#cd_secure_credentials).",
},
},
},
Expand Down
4 changes: 2 additions & 2 deletions ibm/service/cdtoolchain/data_source_ibm_cd_toolchain_tool_jira.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func DataSourceIBMCdToolchainToolJira() *schema.Resource {
"resource_group_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "Resource group where the tool can be found.",
Description: "Resource group where the tool is located.",
},
"crn": &schema.Schema{
Type: schema.TypeString,
Expand Down Expand Up @@ -110,7 +110,7 @@ func DataSourceIBMCdToolchainToolJira() *schema.Resource {
Type: schema.TypeString,
Computed: true,
Sensitive: true,
Description: "The api token for your JIRA account. Optional for public projects.",
Description: "The api token for your JIRA account. Optional for public projects. You can use a toolchain secret reference for this parameter. For more information, see [Protecting your sensitive data in Continuous Delivery](https://cloud.ibm.com/docs/ContinuousDelivery?topic=ContinuousDelivery-cd_data_security#cd_secure_credentials).",
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/data_source_ibm_cd_toolchain_tool_keyprotect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func DataSourceIBMCdToolchainToolKeyprotect() *schema.Resource {
"resource_group_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "Resource group where the tool can be found.",
Description: "Resource group where the tool is located.",
},
"crn": &schema.Schema{
Type: schema.TypeString,
Expand Down
4 changes: 2 additions & 2 deletions ibm/service/cdtoolchain/data_source_ibm_cd_toolchain_tool_nexus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func DataSourceIBMCdToolchainToolNexus() *schema.Resource {
"resource_group_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "Resource group where the tool can be found.",
Description: "Resource group where the tool is located.",
},
"crn": &schema.Schema{
Type: schema.TypeString,
Expand Down Expand Up @@ -105,7 +105,7 @@ func DataSourceIBMCdToolchainToolNexus() *schema.Resource {
Type: schema.TypeString,
Computed: true,
Sensitive: true,
Description: "The password or token for authenticating to the Nexus repository.",
Description: "The password or token for authenticating to the Nexus repository. You can use a toolchain secret reference for this parameter. For more information, see [Protecting your sensitive data in Continuous Delivery](https://cloud.ibm.com/docs/ContinuousDelivery?topic=ContinuousDelivery-cd_data_security#cd_secure_credentials).",
},
"release_url": &schema.Schema{
Type: schema.TypeString,
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/data_source_ibm_cd_toolchain_tool_pagerduty.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func DataSourceIBMCdToolchainToolPagerduty() *schema.Resource {
"resource_group_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "Resource group where the tool can be found.",
Description: "Resource group where the tool is located.",
},
"crn": &schema.Schema{
Type: schema.TypeString,
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/data_source_ibm_cd_toolchain_tool_pipeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func DataSourceIBMCdToolchainToolPipeline() *schema.Resource {
"resource_group_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "Resource group where the tool can be found.",
Description: "Resource group where the tool is located.",
},
"crn": &schema.Schema{
Type: schema.TypeString,
Expand Down
4 changes: 2 additions & 2 deletions ibm/service/cdtoolchain/data_source_ibm_cd_toolchain_tool_privateworker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func DataSourceIBMCdToolchainToolPrivateworker() *schema.Resource {
"resource_group_id": &schema.Schema{
Type: schema.TypeString,
Computed: true,
Description: "Resource group where the tool can be found.",
Description: "Resource group where the tool is located.",
},
"crn": &schema.Schema{
Type: schema.TypeString,
Expand Down Expand Up @@ -95,7 +95,7 @@ func DataSourceIBMCdToolchainToolPrivateworker() *schema.Resource {
Type: schema.TypeString,
Computed: true,
Sensitive: true,
Description: "The service ID API key that is used by the private worker to authenticate access to the work queue.",
Description: "The service ID API key that is used by the private worker to authenticate access to the work queue. You can use a toolchain secret reference for this parameter. For more information, see [Protecting your sensitive data in Continuous Delivery](https://cloud.ibm.com/docs/ContinuousDelivery?topic=ContinuousDelivery-cd_data_security#cd_secure_credentials).",
},
"worker_queue_identifier": &schema.Schema{
Type: schema.TypeString,
Expand Down
Loading