Skip to content

Commit

Permalink
fix(LH-74651): terraform-provider-cdo-ci (#125)
Browse files Browse the repository at this point in the history
* fix

* trigger acceptance tests

* fix+1

* fix cdfmc name

* run again with debug log

* retrigger to see if reonboard ftd fix tests

* undo running acceptance tests in pr
  • Loading branch information
weilueluo authored Jan 22, 2024
1 parent 007cfae commit 6b98bd7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
6 changes: 3 additions & 3 deletions provider/.github-action.env
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ ASA_DATA_SOURCE_TAGS=ci
CONNECTOR_DATA_SOURCE_NAME=CDO_terraform-provider-cdo-SDC-1
CONNECTOR_RESOURCE_NAME=test-sdc-1
CONNECTOR_RESOURCE_NEW_NAME=test-sdc-2
CLOUD_FMC_DATA_SOURCE_HOSTNAME=terraform-provider-cdo.app.staging.cdo.cisco.com
CLOUD_FMC_DATA_SOURCE_SOFTWARE_VERSION=7.3.1-build 6035
CLOUD_FMC_DATA_SOURCE_HOSTNAME=cdo-terraform-provider-cdo.app.staging.cdo.cisco.com
CLOUD_FMC_RESOURCE_NAME=FMC
CLOUD_FMC_RESOURCE_HOSTNAME=terraform-provider-cdo.app.staging.cdo.cisco.com
CLOUD_FMC_RESOURCE_HOSTNAME=cdo-terraform-provider-cdo.app.staging.cdo.cisco.com
TF_LOG=DEBUG
4 changes: 0 additions & 4 deletions provider/internal/acctest/environment.go
Original file line number Diff line number Diff line change
Expand Up @@ -299,10 +299,6 @@ func (e *env) CloudFmcDataSourceHostname() string {
return e.mustGetString("CLOUD_FMC_DATA_SOURCE_HOSTNAME")
}

func (e *env) CloudFmcDataSourceSoftwareVersion() string {
return e.mustGetString("CLOUD_FMC_DATA_SOURCE_SOFTWARE_VERSION")
}

func (e *env) CloudFmcResourceName() string {
return e.mustGetString("CLOUD_FMC_RESOURCE_NAME")
}
Expand Down
7 changes: 2 additions & 5 deletions provider/internal/cdfmc/data_source_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@ import (
)

var testCdFmc = struct {
Hostname string
SoftwareVersion string
Hostname string
}{
Hostname: acctest.Env.CloudFmcDataSourceHostname(),
SoftwareVersion: acctest.Env.CloudFmcDataSourceSoftwareVersion(),
Hostname: acctest.Env.CloudFmcDataSourceHostname(),
}

const testCdFmcTemplate = `
Expand All @@ -30,7 +28,6 @@ func TestAccCdFmcDataSource(t *testing.T) {
Config: acctest.ProviderConfig() + testCdfmcConfig,
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.cdo_cdfmc.test", "hostname", testCdFmc.Hostname),
resource.TestCheckResourceAttr("data.cdo_cdfmc.test", "software_version", testCdFmc.SoftwareVersion),
),
},
},
Expand Down

0 comments on commit 6b98bd7

Please sign in to comment.