Skip to content

Commit

Permalink
chore: update cli client to v2.64.0 (#850)
Browse files Browse the repository at this point in the history
* chore: update cli client to v2.64.0
  • Loading branch information
v0lkc authored Jul 16, 2024
1 parent b445af8 commit e2c53e5
Show file tree
Hide file tree
Showing 202 changed files with 28,793 additions and 78,411 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/SAP/terraform-provider-btp

go 1.22
go 1.22.0

require (
github.com/hashicorp/go-uuid v1.0.3
Expand Down
2 changes: 1 addition & 1 deletion internal/btpcli/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const (
HeaderCLIServerMessage string = "X-Cpcli-Server-Message"
)

const cliTargetProtocolVersion string = "v2.49.0"
const cliTargetProtocolVersion string = "v2.64.0"

type v2ContextKey string

Expand Down
2 changes: 1 addition & 1 deletion internal/provider/datasource_directories_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func TestDataSourceDirectories(t *testing.T) {
{
Config: hclProviderFor(user) + hclDataSourceDirectories("uut"),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.btp_directories.uut", "values.#", "4"),
resource.TestCheckResourceAttr("data.btp_directories.uut", "values.#", "8"),
),
},
},
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/datasource_directory_users_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func TestDataSourceDirectoryUsers(t *testing.T) {
Config: hclProviderFor(user) + hclDatasourceDirectoryUsersDefaultIdp("uut", "integration-test-dir-se-static"),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestMatchResourceAttr("data.btp_directory_users.uut", "directory_id", regexpValidUUID),
resource.TestCheckResourceAttr("data.btp_directory_users.uut", "values.#", "1"),
resource.TestCheckResourceAttr("data.btp_directory_users.uut", "values.#", "9"),
),
},
},
Expand All @@ -43,7 +43,7 @@ func TestDataSourceDirectoryUsers(t *testing.T) {
Config: hclProviderFor(user) + hclDatasourceDirectoryUsersWithCustomIdp("uut", "integration-test-dir-se-static", "terraformint-platform"),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestMatchResourceAttr("data.btp_directory_users.uut", "directory_id", regexpValidUUID),
resource.TestCheckResourceAttr("data.btp_directory_users.uut", "values.#", "1"),
resource.TestCheckResourceAttr("data.btp_directory_users.uut", "values.#", "5"),
),
},
},
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/datasource_globalaccount_app.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func (ds *globalaccountAppDataSource) Schema(_ context.Context, _ datasource.Sch
MarkdownDescription: `Gets details about a specific app.
__Tip:__
You must be assigned to the admin or viewer role of the global account.`,
You must be assigned to the admin or viewer role of the global account.`,
Attributes: map[string]schema.Attribute{
"id": schema.StringAttribute{
MarkdownDescription: "The application ID is the xsappname plus the identifier, which consists of an exclamation mark (!), an identifier for the plan under which the application is deployed, and an index number.",
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/datasource_globalaccount_apps.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func (ds *globalaccountAppsDataSource) Schema(_ context.Context, _ datasource.Sc
MarkdownDescription: `Lists all apps.
__Tip:__
You must be assigned to the admin or viewer role of the global account.`,
You must be assigned to the admin or viewer role of the global account.`,
Attributes: map[string]schema.Attribute{
"values": schema.ListNestedAttribute{
NestedObject: schema.NestedAttributeObject{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func TestDataSourceGlobalaccountEntitlements(t *testing.T) {
{
Config: hclProviderFor(user) + hclDatasourceGlobalaccountEntitlements("uut"),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.btp_globalaccount_entitlements.uut", "values.%", "1"),
resource.TestCheckResourceAttr("data.btp_globalaccount_entitlements.uut", "values.%", "174"),
),
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func TestDataSourceGlobalaccountResourceProviders(t *testing.T) {
{
Config: hclProviderFor(user) + hclDatasourceGlobalaccountResourceProviders("uut"),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.btp_globalaccount_resource_providers.uut", "values.#", "1"),
resource.TestCheckResourceAttr("data.btp_globalaccount_resource_providers.uut", "values.#", "2"),
resource.TestCheckResourceAttr("data.btp_globalaccount_resource_providers.uut", "values.0.provider_type", "AWS"),
resource.TestCheckResourceAttr("data.btp_globalaccount_resource_providers.uut", "values.0.technical_name", "tf_test_resource_provider"),
resource.TestCheckResourceAttr("data.btp_globalaccount_resource_providers.uut", "values.0.display_name", "Test AWS Resource Provider"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func (ds *globalaccountRoleCollectionDataSource) Schema(_ context.Context, _ dat
MarkdownDescription: `Gets details about a specific global account role collection.
__Tip:__
You must be assigned to the admin or viewer role of the global account.`,
You must be assigned to the admin or viewer role of the global account.`,
Attributes: map[string]schema.Attribute{
"name": schema.StringAttribute{
MarkdownDescription: "The name of the role collection.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func TestDataSourceGlobalaccountTrustConfiguration(t *testing.T) {
resource.TestCheckResourceAttr("data.btp_globalaccount_trust_configuration.uut", "description", "Custom Platform Identity Provider"),
resource.TestCheckResourceAttr("data.btp_globalaccount_trust_configuration.uut", "identity_provider", "terraformint.accounts400.ondemand.com"),
resource.TestCheckResourceAttr("data.btp_globalaccount_trust_configuration.uut", "name", "terraformint-platform"),
resource.TestCheckResourceAttr("data.btp_globalaccount_trust_configuration.uut", "domain", ""),
resource.TestCheckResourceAttr("data.btp_globalaccount_trust_configuration.uut", "domain", "terraformint.accounts400.ondemand.com"),
resource.TestCheckResourceAttr("data.btp_globalaccount_trust_configuration.uut", "protocol", "OpenID Connect"),
resource.TestCheckResourceAttr("data.btp_globalaccount_trust_configuration.uut", "read_only", "false"),
resource.TestCheckResourceAttr("data.btp_globalaccount_trust_configuration.uut", "status", "active"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func TestDataSourceGlobalaccountTrustConfigurations(t *testing.T) {
{
Config: hclProviderFor(user) + hclDatasourceGlobalaccountTrustConfigurations("uut"),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.btp_globalaccount_trust_configurations.uut", "values.#", "3"),
resource.TestCheckResourceAttr("data.btp_globalaccount_trust_configurations.uut", "values.#", "4"),
),
},
},
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/datasource_globalaccount_user.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func (ds *globalaccountUserDataSource) Schema(_ context.Context, _ datasource.Sc
MarkdownDescription: `Shows registered users in a global account. Users belong to one of the identity providers (IdPs) of the global account.
__Tip:__
You must be assigned to the admin or viewer role of the global account.`,
You must be assigned to the admin or viewer role of the global account.`,
Attributes: map[string]schema.Attribute{
"origin": schema.StringAttribute{
MarkdownDescription: "The identity provider that hosts the user. Only needed for custom identity provider.",
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/datasource_globalaccount_users_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func TestDataSourceGlobalaccountUsers(t *testing.T) {
{
Config: hclProviderFor(user) + hclDatasourceGlobalaccountUsers("uut"),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.btp_globalaccount_users.uut", "values.#", "15"),
resource.TestCheckResourceAttr("data.btp_globalaccount_users.uut", "values.#", "30"),
),
},
},
Expand All @@ -41,7 +41,7 @@ func TestDataSourceGlobalaccountUsers(t *testing.T) {
{
Config: hclProviderFor(user) + hclDatasourceGlobalaccountUsersWithCustomIdp("uut", "terraformint-platform"),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.btp_globalaccount_users.uut", "values.#", "4"),
resource.TestCheckResourceAttr("data.btp_globalaccount_users.uut", "values.#", "7"),
),
},
},
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/datasource_subaccount_apps_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func TestDataSourceSubaccountApps(t *testing.T) {
Config: hclProviderFor(user) + hclDatasourceSubaccountApps("uut", "integration-test-services-static"),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestMatchResourceAttr("data.btp_subaccount_apps.uut", "subaccount_id", regexpValidUUID),
resource.TestCheckResourceAttr("data.btp_subaccount_apps.uut", "values.#", "15"),
resource.TestCheckResourceAttr("data.btp_subaccount_apps.uut", "values.#", "17"),
),
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func TestDataSourceSubaccountEntitlements(t *testing.T) {
Config: hclProviderFor(user) + hclDatasourceSubaccountEntitlements("uut", "integration-test-acc-static"),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestMatchResourceAttr("data.btp_subaccount_entitlements.uut", "subaccount_id", regexpValidUUID),
resource.TestCheckResourceAttr("data.btp_subaccount_entitlements.uut", "values.%", "29"),
resource.TestCheckResourceAttr("data.btp_subaccount_entitlements.uut", "values.%", "30"),
),
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func TestDataSourceSubaccountEnvironments(t *testing.T) {
Config: hclProviderFor(user) + hclDatasourceSubaccountEnvironments("uut", "integration-test-acc-static"),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestMatchResourceAttr("data.btp_subaccount_environments.uut", "subaccount_id", regexpValidUUID),
resource.TestCheckResourceAttr("data.btp_subaccount_environments.uut", "values.#", "2"),
resource.TestCheckResourceAttr("data.btp_subaccount_environments.uut", "values.#", "3"),
),
},
},
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/datasource_subaccount_roles_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func TestDataSourceSubaccountRoles(t *testing.T) {
Config: hclProviderFor(user) + hclDatasourceSubaccountRoles("uut", "integration-test-acc-static"),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestMatchResourceAttr("data.btp_subaccount_roles.uut", "subaccount_id", regexpValidUUID),
resource.TestCheckResourceAttr("data.btp_subaccount_roles.uut", "values.#", "26"),
resource.TestCheckResourceAttr("data.btp_subaccount_roles.uut", "values.#", "30"),
resource.TestCheckResourceAttrSet("data.btp_subaccount_roles.uut", "values.0.app_name"),
),
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func (ds *subaccountServiceBindingsDataSource) Schema(_ context.Context, _ datas
MarkdownDescription: `Lists all service bindings in a subaccount, i.e. the access details to consume a service.
__Tip:__
You must be assigned to the admin or viewer role of the subaccount.`,
You must be assigned to the admin or viewer role of the subaccount.`,
Attributes: map[string]schema.Attribute{
"subaccount_id": schema.StringAttribute{
MarkdownDescription: "The ID of the subaccount.",
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/datasource_subaccount_service_broker.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func (ds *subaccountServiceBrokerDataSource) Schema(_ context.Context, _ datasou
MarkdownDescription: `Gets details about a specific service broker registered in a subaccount, such as its name, description, labels, and URL.
__Tip:__
You must be assigned to the admin or viewer role of the subaccount.`,
You must be assigned to the admin or viewer role of the subaccount.`,
Attributes: map[string]schema.Attribute{
"subaccount_id": schema.StringAttribute{
MarkdownDescription: "The ID of the subaccount.",
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/datasource_subaccount_service_brokers.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func (ds *subaccountServiceBrokersDataSource) Schema(_ context.Context, _ dataso
MarkdownDescription: `Lists all service brokers in a subaccount.
__Tip:__
You must be assigned to the admin or viewer role of the subaccount.`,
You must be assigned to the admin or viewer role of the subaccount.`,
Attributes: map[string]schema.Attribute{
"subaccount_id": schema.StringAttribute{
MarkdownDescription: "The ID of the subaccount.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func (ds *subaccountServiceInstanceDataSource) Schema(_ context.Context, _ datas
MarkdownDescription: `Gets details about a specific provisioned service instance, such as its name, id, platform to which it belongs, and the last operation performed.
__Tip:__
You must be assigned to the admin or viewer role of the subaccount.`,
You must be assigned to the admin or viewer role of the subaccount.`,
Attributes: map[string]schema.Attribute{
"subaccount_id": schema.StringAttribute{
MarkdownDescription: "The ID of the subaccount.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func (ds *subaccountServiceInstancesDataSource) Schema(_ context.Context, _ data
MarkdownDescription: `Lists all service instances in a subaccount.
__Tip:__
You must be assigned to the admin or viewer role of the subaccount.`,
You must be assigned to the admin or viewer role of the subaccount.`,
Attributes: map[string]schema.Attribute{
"subaccount_id": schema.StringAttribute{
MarkdownDescription: "The ID of the subaccount.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func (ds *subaccountServiceOfferingDataSource) Schema(_ context.Context, _ datas
MarkdownDescription: `Gets details about a specific service offering such as its ID, name, description, metadata, and the associated service brokers.
__Tip:__
You must be assigned to the admin or viewer role of the subaccount.`,
You must be assigned to the admin or viewer role of the subaccount.`,
Attributes: map[string]schema.Attribute{
"subaccount_id": schema.StringAttribute{
MarkdownDescription: "The ID of the subaccount.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func (ds *subaccountServiceOfferingsDataSource) Schema(_ context.Context, _ data
MarkdownDescription: `Lists the services your subaccount is entitled to use in your runtime environment.
__Tip:__
You must be assigned to the admin or viewer role of the subaccount.`,
You must be assigned to the admin or viewer role of the subaccount.`,
Attributes: map[string]schema.Attribute{
"subaccount_id": schema.StringAttribute{
MarkdownDescription: "The ID of the subaccount.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func TestDataSourceSubaccountServiceOfferings(t *testing.T) {
Config: hclProviderFor(user) + hclDatasourceSubaccountOfferingsBySubaccount("uut", "integration-test-services-static"),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestMatchResourceAttr("data.btp_subaccount_service_offerings.uut", "subaccount_id", regexpValidUUID),
resource.TestCheckResourceAttr("data.btp_subaccount_service_offerings.uut", "values.#", "17"),
resource.TestCheckResourceAttr("data.btp_subaccount_service_offerings.uut", "values.#", "20"),
),
},
},
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/datasource_subaccount_service_plan.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func (ds *subaccountServicePlanDataSource) Schema(_ context.Context, _ datasourc
MarkdownDescription: `Gets details about a specific service plan such as its name, description, and metadata.
__Tip:__
You must be assigned to the admin or viewer role of the subaccount.`,
You must be assigned to the admin or viewer role of the subaccount.`,
Attributes: map[string]schema.Attribute{
"subaccount_id": schema.StringAttribute{
MarkdownDescription: "The ID of the subaccount.",
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/datasource_subaccount_service_plans.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func (ds *subaccountServicePlansDataSource) Schema(_ context.Context, _ datasour
MarkdownDescription: `Lists the plans of services that your subaccount is entitled to use in your environment.
__Tip:__
You must be assigned to the admin or viewer role of the subaccount.`,
You must be assigned to the admin or viewer role of the subaccount.`,
Attributes: map[string]schema.Attribute{
"subaccount_id": schema.StringAttribute{
MarkdownDescription: "The ID of the subaccount.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func TestDataSourceSubaccountServicePlans(t *testing.T) {
Config: hclProviderFor(user) + hclDatasourceSubaccountPlansBySubaccount("uut", "integration-test-services-static"),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestMatchResourceAttr("data.btp_subaccount_service_plans.uut", "subaccount_id", regexpValidUUID),
resource.TestCheckResourceAttr("data.btp_subaccount_service_plans.uut", "values.#", "34"),
resource.TestCheckResourceAttr("data.btp_subaccount_service_plans.uut", "values.#", "35"),
),
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func (ds *subaccountServicePlatformDataSource) Schema(_ context.Context, _ datas
MarkdownDescription: `Gets details about a specific platform that is registered for service consumption in a subaccount by platform id or by platform name. Details include the platform's name, type, and labels.
__Tip:__
You must be assigned to the admin or viewer role of the subaccount.`,
You must be assigned to the admin or viewer role of the subaccount.`,
Attributes: map[string]schema.Attribute{
"subaccount_id": schema.StringAttribute{
MarkdownDescription: "The ID of the subaccount.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func (ds *subaccountServicePlatformsDataSource) Schema(_ context.Context, _ data
MarkdownDescription: `Lists all platforms in a subaccount that are registered for service consumption.
__Tip:__
You must be assigned to the admin or viewer role of the subaccount.`,
You must be assigned to the admin or viewer role of the subaccount.`,
Attributes: map[string]schema.Attribute{
"subaccount_id": schema.StringAttribute{
MarkdownDescription: "The ID of the subaccount.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func TestDataSourceSubaccountSubscriptions(t *testing.T) {
Config: hclProviderFor(user) + hclDatasourceSubaccountSubscriptionsBySubaccount("uut", "integration-test-services-static"),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestMatchResourceAttr("data.btp_subaccount_subscriptions.uut", "subaccount_id", regexpValidUUID),
resource.TestCheckResourceAttr("data.btp_subaccount_subscriptions.uut", "values.#", "5"),
resource.TestCheckResourceAttr("data.btp_subaccount_subscriptions.uut", "values.#", "11"),
),
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@ func TestDataSourceSubaccountTrustConfiguration(t *testing.T) {
ProtoV6ProviderFactories: getProviders(rec.GetDefaultClient()),
Steps: []resource.TestStep{
{
Config: hclProviderFor(user) + hclDatasourceSubaccountTrustConfigurationBySubaccount("uut", "integration-test-acc-static", "terraformint-platform"),
Config: hclProviderFor(user) + hclDatasourceSubaccountTrustConfigurationBySubaccount("uut", "integration-test-acc-static", "sap.custom"),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.btp_subaccount_trust_configuration.uut", "id", "terraformint-platform"),
resource.TestCheckResourceAttr("data.btp_subaccount_trust_configuration.uut", "id", "sap.custom"),
resource.TestCheckResourceAttr("data.btp_subaccount_trust_configuration.uut", "description", "Custom Platform Identity Provider"),
resource.TestCheckResourceAttr("data.btp_subaccount_trust_configuration.uut", "identity_provider", "terraformint.accounts400.ondemand.com"),
resource.TestCheckResourceAttr("data.btp_subaccount_trust_configuration.uut", "name", "terraformint-platform"),
resource.TestCheckResourceAttr("data.btp_subaccount_trust_configuration.uut", "protocol", "OpenID Connect"),
resource.TestCheckResourceAttr("data.btp_subaccount_trust_configuration.uut", "read_only", "true"),
resource.TestCheckResourceAttr("data.btp_subaccount_trust_configuration.uut", "read_only", "false"),
resource.TestCheckResourceAttr("data.btp_subaccount_trust_configuration.uut", "status", "active"),
resource.TestCheckResourceAttr("data.btp_subaccount_trust_configuration.uut", "type", "Platform"),
resource.TestCheckResourceAttr("data.btp_subaccount_trust_configuration.uut", "type", "Application"),
),
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func TestDataSourceSubaccountTrustConfigurations(t *testing.T) {
{
Config: hclProviderFor(user) + hclDatasourceSubaccountTrustConfigurationsBySubaccount("uut", "integration-test-acc-static"),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.btp_subaccount_trust_configurations.uut", "values.#", "3"),
resource.TestCheckResourceAttr("data.btp_subaccount_trust_configurations.uut", "values.#", "4"),
),
},
},
Expand Down
Loading

0 comments on commit e2c53e5

Please sign in to comment.