Skip to content

Commit ab568a4

Browse files
ritek01ritek01
authored
feat: [CDS-101927]: Categorize CD + Pipeline Connectors (#1105)
* feat: [CDS-101927]: Categorize CD Cloud Providers Connectors * feat: [CDS-101927]: Categorize CD Artifact Repositories Connectors * feat: [CDS-101927]: Categorize CD Code Repositories Connectors * fix: [CDS-101927]: CD http helm ConnectorTest * fix: [CDS-101927]: Add Cd Pre-requisite * fix: [CDS-101927]: Fix Artifact Connector test * fix: [CDS-101927]: Fix Artifact Connector test * fix: [CDS-101927]: Fix Artifact Connector test * fix: [CDS-101927]: Skip two Test for now. * fix: [CDS-101927]: Fix HTTP HELM test
1 parent aca2822 commit ab568a4

File tree

87 files changed

+883
-181
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+883
-181
lines changed

‎internal/provider/provider.go

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ import (
4949
cd_trigger "github.com/harness/terraform-provider-harness/internal/service/cd/trigger"
5050
"github.com/harness/terraform-provider-harness/internal/service/cd/user"
5151
"github.com/harness/terraform-provider-harness/internal/service/cd/yamlconfig"
52+
cdng_connector_artifactRepositories "github.com/harness/terraform-provider-harness/internal/service/cd_nextgen/connector/artifactRepositories"
53+
cdng_connector_cloudProviders "github.com/harness/terraform-provider-harness/internal/service/cd_nextgen/connector/cloudProviders"
54+
cdng_connector_codeRepositories "github.com/harness/terraform-provider-harness/internal/service/cd_nextgen/connector/codeRepositories"
5255
pl_account "github.com/harness/terraform-provider-harness/internal/service/platform/account"
5356
pl_apikey "github.com/harness/terraform-provider-harness/internal/service/platform/api_key"
5457
"github.com/harness/terraform-provider-harness/internal/service/platform/autostopping/load_balancer"
@@ -163,36 +166,36 @@ func Provider(version string) func() *schema.Provider {
163166
"harness_platform_connector_azure_cloud_cost": connector.DataSourceConnectorAzureCloudCost(),
164167
"harness_platform_connector_appdynamics": connector.DatasourceConnectorAppDynamics(),
165168
"harness_platform_connector_elasticsearch": connector.DatasourceConnectorElasticSearch(),
166-
"harness_platform_connector_artifactory": connector.DatasourceConnectorArtifactory(),
169+
"harness_platform_connector_artifactory": cdng_connector_artifactRepositories.DatasourceConnectorArtifactory(),
167170
"harness_platform_connector_aws_secret_manager": pl_secretManagers.DatasourceConnectorAwsSM(),
168-
"harness_platform_connector_aws": connector.DatasourceConnectorAws(),
171+
"harness_platform_connector_aws": cdng_connector_cloudProviders.DatasourceConnectorAws(),
169172
"harness_platform_connector_awscc": connector.DatasourceConnectorAwsCC(),
170173
"harness_platform_connector_awskms": pl_secretManagers.DatasourceConnectorAwsKms(),
171-
"harness_platform_connector_bitbucket": connector.DatasourceConnectorBitbucket(),
174+
"harness_platform_connector_bitbucket": cdng_connector_codeRepositories.DatasourceConnectorBitbucket(),
172175
"harness_platform_connector_customhealthsource": connector.DatasourceConnectorCustomHealthSource(),
173176
"harness_platform_connector_datadog": connector.DatasourceConnectorDatadog(),
174-
"harness_platform_connector_docker": connector.DatasourceConnectorDocker(),
177+
"harness_platform_connector_docker": cdng_connector_artifactRepositories.DatasourceConnectorDocker(),
175178
"harness_platform_connector_jdbc": connector.DatasourceConnectorJDBC(),
176179
"harness_platform_connector_dynatrace": connector.DatasourceConnectorDynatrace(),
177-
"harness_platform_connector_gcp": connector.DatasourceConnectorGcp(),
180+
"harness_platform_connector_gcp": cdng_connector_cloudProviders.DatasourceConnectorGcp(),
178181
"harness_platform_connector_gcp_secret_manager": pl_secretManagers.DatasourceConnectorGcpSM(),
179-
"harness_platform_connector_git": connector.DatasourceConnectorGit(),
180-
"harness_platform_connector_github": connector.DatasourceConnectorGithub(),
181-
"harness_platform_connector_gitlab": connector.DatasourceConnectorGitlab(),
182-
"harness_platform_connector_helm": connector.DatasourceConnectorHelm(),
183-
"harness_platform_connector_oci_helm": connector.DatasourceConnectorOciHelm(),
182+
"harness_platform_connector_git": cdng_connector_codeRepositories.DatasourceConnectorGit(),
183+
"harness_platform_connector_github": cdng_connector_codeRepositories.DatasourceConnectorGithub(),
184+
"harness_platform_connector_gitlab": cdng_connector_codeRepositories.DatasourceConnectorGitlab(),
185+
"harness_platform_connector_helm": cdng_connector_artifactRepositories.DatasourceConnectorHelm(),
186+
"harness_platform_connector_oci_helm": cdng_connector_artifactRepositories.DatasourceConnectorOciHelm(),
184187
"harness_platform_connector_jira": connector.DatasourceConnectorJira(),
185-
"harness_platform_connector_jenkins": connector.DataSourceConnectorJenkins(),
186-
"harness_platform_connector_kubernetes": connector.DatasourceConnectorKubernetes(),
187-
"harness_platform_connector_nexus": connector.DatasourceConnectorNexus(),
188+
"harness_platform_connector_jenkins": cdng_connector_artifactRepositories.DataSourceConnectorJenkins(),
189+
"harness_platform_connector_kubernetes": cdng_connector_cloudProviders.DatasourceConnectorKubernetes(),
190+
"harness_platform_connector_nexus": cdng_connector_artifactRepositories.DatasourceConnectorNexus(),
188191
"harness_platform_connector_pagerduty": connector.DatasourceConnectorPagerDuty(),
189192
"harness_platform_connector_prometheus": connector.DatasourceConnectorPrometheus(),
190-
"harness_platform_connector_rancher": connector.DatasourceConnectorRancher(),
193+
"harness_platform_connector_rancher": cdng_connector_cloudProviders.DatasourceConnectorRancher(),
191194
"harness_platform_connector_splunk": connector.DatasourceConnectorSplunk(),
192-
"harness_platform_connector_spot": connector.DatasourceConnectorSpot(),
193-
"harness_platform_connector_terraform_cloud": connector.DatasourceConnectorTerraformCloud(),
195+
"harness_platform_connector_spot": cdng_connector_cloudProviders.DatasourceConnectorSpot(),
196+
"harness_platform_connector_terraform_cloud": cdng_connector_cloudProviders.DatasourceConnectorTerraformCloud(),
194197
"harness_platform_connector_sumologic": connector.DatasourceConnectorSumologic(),
195-
"harness_platform_connector_pdc": connector.DatasourceConnectorPdc(),
198+
"harness_platform_connector_pdc": cdng_connector_cloudProviders.DatasourceConnectorPdc(),
196199
"harness_platform_connector_custom_secret_manager": pl_secretManagers.DatasourceConnectorCustomSM(),
197200
"harness_platform_current_account": pl_account.DataSourceCurrentAccount(),
198201
"harness_platform_current_user": pl_current_user.DataSourceCurrentUser(),
@@ -258,8 +261,8 @@ func Provider(version string) func() *schema.Provider {
258261
"harness_user_group": user.DataSourceUserGroup(),
259262
"harness_user": user.DataSourceUser(),
260263
"harness_yaml_config": yamlconfig.DataSourceYamlConfig(),
261-
"harness_platform_connector_azure_cloud_provider": connector.DataSourceConnectorAzureCloudProvider(),
262-
"harness_platform_connector_tas": connector.DataSourceConnectorTas(),
264+
"harness_platform_connector_azure_cloud_provider": cdng_connector_cloudProviders.DataSourceConnectorAzureCloudProvider(),
265+
"harness_platform_connector_tas": cdng_connector_cloudProviders.DataSourceConnectorTas(),
263266
"harness_trigger": cd_trigger.DataSourceTrigger(),
264267
"harness_platform_policy": policy.DataSourcePolicy(),
265268
"harness_platform_policyset": policyset.DataSourcePolicyset(),
@@ -300,37 +303,37 @@ func Provider(version string) func() *schema.Provider {
300303
"harness_platform_connector_azure_cloud_cost": connector.ResourceConnectorAzureCloudCost(),
301304
"harness_platform_connector_appdynamics": connector.ResourceConnectorAppDynamics(),
302305
"harness_platform_connector_elasticsearch": connector.ResourceConnectorElasticSearch(),
303-
"harness_platform_connector_artifactory": connector.ResourceConnectorArtifactory(),
306+
"harness_platform_connector_artifactory": cdng_connector_artifactRepositories.ResourceConnectorArtifactory(),
304307
"harness_platform_connector_aws_secret_manager": pl_secretManagers.ResourceConnectorAwsSM(),
305-
"harness_platform_connector_aws": connector.ResourceConnectorAws(),
308+
"harness_platform_connector_aws": cdng_connector_cloudProviders.ResourceConnectorAws(),
306309
"harness_platform_connector_awscc": connector.ResourceConnectorAwsCC(),
307310
"harness_platform_connector_awskms": pl_secretManagers.ResourceConnectorAwsKms(),
308-
"harness_platform_connector_bitbucket": connector.ResourceConnectorBitbucket(),
311+
"harness_platform_connector_bitbucket": cdng_connector_codeRepositories.ResourceConnectorBitbucket(),
309312
"harness_platform_connector_customhealthsource": connector.ResourceConnectorCustomHealthSource(),
310313
"harness_platform_connector_datadog": connector.ResourceConnectorDatadog(),
311-
"harness_platform_connector_docker": connector.ResourceConnectorDocker(),
314+
"harness_platform_connector_docker": cdng_connector_artifactRepositories.ResourceConnectorDocker(),
312315
"harness_platform_connector_jdbc": connector.ResourceConnectorJDBC(),
313316
"harness_platform_connector_dynatrace": connector.ResourceConnectorDynatrace(),
314-
"harness_platform_connector_gcp": connector.ResourceConnectorGcp(),
317+
"harness_platform_connector_gcp": cdng_connector_cloudProviders.ResourceConnectorGcp(),
315318
"harness_platform_connector_gcp_secret_manager": pl_secretManagers.ResourceConnectorGCPSecretManager(),
316-
"harness_platform_connector_git": connector.ResourceConnectorGit(),
317-
"harness_platform_connector_github": connector.ResourceConnectorGithub(),
318-
"harness_platform_connector_gitlab": connector.ResourceConnectorGitlab(),
319-
"harness_platform_connector_helm": connector.ResourceConnectorHelm(),
320-
"harness_platform_connector_oci_helm": connector.ResourceConnectorOciHelm(),
319+
"harness_platform_connector_git": cdng_connector_codeRepositories.ResourceConnectorGit(),
320+
"harness_platform_connector_github": cdng_connector_codeRepositories.ResourceConnectorGithub(),
321+
"harness_platform_connector_gitlab": cdng_connector_codeRepositories.ResourceConnectorGitlab(),
322+
"harness_platform_connector_helm": cdng_connector_artifactRepositories.ResourceConnectorHelm(),
323+
"harness_platform_connector_oci_helm": cdng_connector_artifactRepositories.ResourceConnectorOciHelm(),
321324
"harness_platform_connector_jira": connector.ResourceConnectorJira(),
322-
"harness_platform_connector_jenkins": connector.ResourceConnectorJenkins(),
323-
"harness_platform_connector_kubernetes": connector.ResourceConnectorK8s(),
325+
"harness_platform_connector_jenkins": cdng_connector_artifactRepositories.ResourceConnectorJenkins(),
326+
"harness_platform_connector_kubernetes": cdng_connector_cloudProviders.ResourceConnectorK8s(),
324327
"harness_platform_connector_newrelic": connector.ResourceConnectorNewRelic(),
325-
"harness_platform_connector_nexus": connector.ResourceConnectorNexus(),
328+
"harness_platform_connector_nexus": cdng_connector_artifactRepositories.ResourceConnectorNexus(),
326329
"harness_platform_connector_pagerduty": connector.ResourceConnectorPagerDuty(),
327330
"harness_platform_connector_prometheus": connector.ResourceConnectorPrometheus(),
328-
"harness_platform_connector_rancher": connector.ResourceConnectorK8sRancher(),
331+
"harness_platform_connector_rancher": cdng_connector_cloudProviders.ResourceConnectorK8sRancher(),
329332
"harness_platform_connector_splunk": connector.ResourceConnectorSplunk(),
330-
"harness_platform_connector_spot": connector.ResourceConnectorSpot(),
331-
"harness_platform_connector_terraform_cloud": connector.ResourceConnectorTerraformCloud(),
333+
"harness_platform_connector_spot": cdng_connector_cloudProviders.ResourceConnectorSpot(),
334+
"harness_platform_connector_terraform_cloud": cdng_connector_cloudProviders.ResourceConnectorTerraformCloud(),
332335
"harness_platform_connector_sumologic": connector.ResourceConnectorSumologic(),
333-
"harness_platform_connector_pdc": connector.ResourceConnectorPdc(),
336+
"harness_platform_connector_pdc": cdng_connector_cloudProviders.ResourceConnectorPdc(),
334337
"harness_platform_environment": pl_environment.ResourceEnvironment(),
335338
"harness_platform_db_schema": dbschema.ResourceDBSchema(),
336339
"harness_platform_db_instance": dbinstance.ResourceDBInstance(),
@@ -407,8 +410,8 @@ func Provider(version string) func() *schema.Provider {
407410
"harness_user_group_permissions": user.ResourceUserGroupPermissions(),
408411
"harness_user": user.ResourceUser(),
409412
"harness_yaml_config": yamlconfig.ResourceYamlConfig(),
410-
"harness_platform_connector_azure_cloud_provider": connector.ResourceConnectorAzureCloudProvider(),
411-
"harness_platform_connector_tas": connector.ResourceConnectorTas(),
413+
"harness_platform_connector_azure_cloud_provider": cdng_connector_cloudProviders.ResourceConnectorAzureCloudProvider(),
414+
"harness_platform_connector_tas": cdng_connector_cloudProviders.ResourceConnectorTas(),
412415
"harness_platform_policy": policy.ResourcePolicy(),
413416
"harness_platform_policyset": policyset.ResourcePolicyset(),
414417
"harness_platform_manual_freeze": manual_freeze.ResourceManualFreeze(),

‎internal/service/cd_nextgen/_PreRequisites/main.tf

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# main.tf
2+
3+
terraform {
4+
required_providers {
5+
harness = {
6+
source = "harness/harness"
7+
}
8+
}
9+
}
10+
11+
resource "harness_platform_secret_text" "TEST_spot_account_id" {
12+
identifier = "TEST_spot_account_id"
13+
name = "TEST_spot_account_id"
14+
description = "This is a test Spot secret text"
15+
tags = ["foo:bar"]
16+
secret_manager_identifier = "harnessSecretManager"
17+
value_type = "Inline"
18+
value = "my_secret_value"
19+
}
20+
resource "harness_platform_secret_text" "TEST_spot_api_token" {
21+
identifier = "TEST_spot_api_token"
22+
name = "TEST_spot_api_token"
23+
description = "This is a test Spot secret text"
24+
tags = ["foo:bar"]
25+
secret_manager_identifier = "harnessSecretManager"
26+
value_type = "Inline"
27+
value = "my_secret_value"
28+
}
29+
30+
resource "harness_platform_secret_text" "TEST_api_token_ref" {
31+
identifier = "TEST_api_token_ref"
32+
name = "TEST_api_token_ref"
33+
description = "This is a test Spot secret text"
34+
tags = ["foo:bar"]
35+
secret_manager_identifier = "harnessSecretManager"
36+
value_type = "Inline"
37+
value = "my_secret_value"
38+
}
39+
40+
resource "harness_platform_secret_text" "doNotDeleteHSM" {
41+
identifier = "doNotDeleteHSM"
42+
name = "doNotDeleteHSM"
43+
description = "This is a test secret text"
44+
tags = ["foo:bar"]
45+
secret_manager_identifier = "harnessSecretManager"
46+
value_type = "Inline"
47+
value = "my_secret_value"
48+
}
49+
50+
# Additional resources can be added as needed

0 commit comments

Comments
 (0)