Merge branch 'master' into vnip2

CHANGELOG.md

@@ -1,3 +1,77 @@
+# 1.58.0 (Sep 29, 2023)
+
+Features
+* Support Satellite Cluster
+    - **Resources**
+        - ibm_satellite_storage_configuration
+        - ibm_satellite_storage_assignment
+    - **Datasources**
+        - ibm_satellite_storage_configuration
+        - ibm_satellite_storage_assignment
+* Support Security and Compliance
+    - **Resources**
+        - ibm_scc_rule
+        - ibm_scc_control_library
+        - ibm_scc_profile
+        - ibm_scc_profile_attachment
+        - ibm_scc_provider_type_instance
+    - **Datasources**
+        - ibm_scc_instance_settings
+        - ibm_scc_control_library
+        - ibm_scc_profile
+        - ibm_scc_profile_attachment
+        - ibm_scc_provider_type
+        - ibm_scc_provider_type_collection
+        - ibm_scc_provider_type_instance
+        - ibm_scc_latest_reports
+        - ibm_scc_report
+        - ibm_scc_report_controls
+        - ibm_scc_report_evaluations
+        - ibm_scc_report_resources
+        - ibm_scc_report_rule
+        - ibm_scc_report_summary
+        - ibm_scc_report_tags
+        - ibm_scc_report_violation_drift
+        - ibm_scc_rule
+
+* Support CD Toolchain
+     - **Datasources**
+        - ibm_cd_toolchains
+* Support Virtual Private Cloud
+    - **Resources**
+        - ibm_is_vpc_dns_resolution_binding
+    - **Datasources**
+        - ibm_is_vpc_dns_resolution_binding
+        - ibm_is_vpc_dns_resolution_bindings
+
+
+Enhancements
+* Added retry mechanism and new SDK generator 3.78 ([4776](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4776))
+* Add default cluster versions to cluster versions data source ([4799](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4799))
+* Add description for keys and force_delete for deleteKeyRings for IBM ([4767](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4767))
+* Retry cloud connection create/update when vpc is unavailable ([4766](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4766))
+* Adding support for COS Static Web hosting ([4766](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4766))
+* add support for endpoint parameter in cluster_config ([4793](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4793))
+* fix(IAM Policy Management): allow sourceServiceName to be optional for authorizational policies ([4804](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4804))
+
+BugFixes
+* ops_manager User Creation ([4755](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4755))
+* fix(share-iops): Share Iops range fix for dp2 ([4807](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4807))
+* fix(VSI-Profile-patch): Remove validation for VSI profile patching ([4824](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4824))
+
+
+# 1.58.0-beta1 (Sep 25, 2023)
+Features
+* Support CD Toolchain
+     - **Datasources**
+        - ibm_cd_toolchains
+* Support Virtual Private Cloud
+    - **Resources**
+        - ibm_is_vpc_dns_resolution_binding
+    - **Datasources**
+        - ibm_is_vpc_dns_resolution_binding
+        - ibm_is_vpc_dns_resolution_bindings
+
 # 1.58.0-beta0 (Sep 10, 2023)
 
 Features

examples/ibm-atracker/README.md

@@ -2,15 +2,15 @@
 
 This example illustrates how to use the AtrackerV2
 
-These types of resources are supported:
+The following types of resources are supported:
 
 * Activity Tracker Target
 * Activity Tracker Route
 * Activity Tracker Settings
 
 ## Usage
 
-To run this example you need to execute:
+To run this example, execute the following commands:
 
 ```bash
 $ terraform init
@@ -29,15 +29,17 @@ atracker_target resource:
 resource "atracker_target" "atracker_target_instance" {
   name = var.atracker_target_name
   target_type = var.atracker_target_target_type
+  region = var.atracker_target_region
   cos_endpoint = var.atracker_target_cos_endpoint
+  logdna_endpoint = var.atracker_target_logdna_endpoint
+  eventstreams_endpoint = var.atracker_target_eventstreams_endpoint
 }
 ```
 atracker_route resource:
 
 ```hcl
 resource "atracker_route" "atracker_route_instance" {
   name = var.atracker_route_name
-  receive_global_events = var.atracker_route_receive_global_events
   rules = var.atracker_route_rules
 }
 ```
@@ -98,9 +100,15 @@ data "atracker_routes" "atracker_routes_instance" {
 | name | The name of the target. The name must be 1000 characters or less, and cannot include any special characters other than `(space) - . _ :`. | `string` | true |
 | target_type | The type of the target. | `string` | true |
 | cos_endpoint | Property values for a Cloud Object Storage Endpoint. | `` | true |
+| eventstreams_endpoint | Property values for the Event Streams Endpoint in responses. | `` | false |
 | name | The name of the route. The name must be 1000 characters or less and cannot include any special characters other than `(space) - . _ :`. | `string` | true |
-| receive_global_events | Indicates whether or not all global events should be forwarded to this region. | `bool` | true |
-| rules | Routing rules that will be evaluated in their order of the array. | `list()` | true |
+| rules | The routing rules that will be evaluated in their order of the array. Once a rule is matched, the remaining rules in the route definition will be skipped. | `list()` | true |
+| default_targets | The target ID List. In the event that no routing rule causes the event to be sent to a target, these targets will receive the event. | `list(string)` | false |
+| permitted_target_regions | If present then only these regions may be used to define a target. | `list(string)` | false |
+| metadata_region_primary | To store all your meta data in a single region. | `string` | true |
+| metadata_region_backup | To store all your meta data in a backup region. | `string` | false |
+| private_api_endpoint_only | If you set this true then you cannot access api through public network. | `bool` | true |
+| region | Limit the query to the specified region. | `string` | false |
 | name | The name of the target resource. | `string` | false |
 | name | The name of the route. | `string` | false |
 

examples/ibm-atracker/main.tf

@@ -41,8 +41,10 @@ resource "ibm_atracker_target" atracker_target_eventstreams_instance {
 // Provision atracker_route resource instance
 resource "ibm_atracker_route" "atracker_route_instance" {
   name = var.atracker_route_name
-  receive_global_events = var.atracker_route_receive_global_events
-  rules = var.atracker_route_rules
+  rules {
+    target_ids = [ ibm_atracker_target.atracker_target_instance.id ]
+    locations = [ "us-south" ]
+  }
 }
 
 // Provision atracker_settings resource instance

examples/ibm-atracker/variables.tf

@@ -15,6 +15,12 @@ variable "atracker_target_target_type" {
   default     = "cloud_object_storage"
 }
 
+variable "atracker_target_region" {
+  description = "Included this optional field if you used it to create a target in a different region other than the one you are connected."
+  type        = string
+  default     = "us-south"
+}
+
 // Resource arguments for atracker_route
 variable "atracker_route_name" {
   description = "The name of the route. The name must be 1000 characters or less and cannot include any special characters other than `(space) - . _ :`."
@@ -66,5 +72,4 @@ variable "atracker_settings_permitted_target_regions" {
   type        = list(string)
   default     = [ "us-south" ]
 }
-
 // Data source arguments for atracker_endpoints

examples/ibm-atracker/versions.tf

@@ -1,3 +1,9 @@
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 1.0"
+  required_providers {
+    ibm = {
+      source = "IBM-Cloud/ibm"
+      version = "1.52.0-beta0"
+    }
+  }
 }

examples/ibm-cos-bucket/main.tf

@@ -410,6 +410,11 @@ resource "ibm_cos_bucket" "cos_bucket_website_configuration" {
   storage_class         = var.standard_storage_class
 
 }
+
+data "ibm_iam_access_group" "public_access_group" {
+  access_group_name = "Public Access"
+}
+
 # Give public access to above mentioned bucket
 resource "ibm_iam_access_group_policy" "policy" { 
   depends_on = [ibm_cos_bucket.cos_bucket_website_configuration] 
@@ -419,8 +424,8 @@ resource "ibm_iam_access_group_policy" "policy" {
   resources { 
     service = "cloud-object-storage" 
     resource_type = "bucket" 
-    resource_instance_id = "COS instance guid" 
-    resource = data.ibm_cos_bucket.cos_bucket_website_configuration.bucket_name 
+    resource_instance_id = "COS instance guid"  # eg : 94xxxxxx-3xxx-4xxx-8xxx-7xxxxxxxxx7
+    resource = ibm_cos_bucket.cos_bucket_website_configuration.bucket_name
   } 
 } 
 

examples/ibm-metrics-router/README.md

@@ -1,4 +1,4 @@
-# Example for IBM Cloud Metrics Routing V3 Example
+# Example for IBM Cloud Metrics Routing
 
 This example illustrates how to use the MetricsRouterV3
 

examples/ibm-metrics-router/variables.tf

@@ -10,7 +10,7 @@ variable "metrics_router_target_name" {
   default     = "my-mr-target"
 }
 variable "metrics_router_target_destination_crn" {
-  description = "The CRN of a destination service instance or resource."
+  description = "The CRN of a destination service instance or resource. Ensure you have a service authorization between IBM Cloud Metrics Routing and your Cloud resource. Read [S2S authorization](https://cloud.ibm.com/docs/metrics-router?topic=metrics-router-target-monitoring&interface=ui#target-monitoring-ui) for details."
   type        = string
   default     = "crn:v1:bluemix:public:sysdig-monitor:us-south:a/0be5ad401ae913d8ff665d92680664ed:22222222-2222-2222-2222-222222222222::"
 }

examples/ibm-scc/control_library/main.tf

@@ -1,4 +1,5 @@
 resource "ibm_scc_control_library" "scc_demo_control_library" {
+  instance_id = "00000000-1111-2222-3333-444444444444"
   control_library_name = var.scc_control_library_name 
   control_library_description = var.scc_control_library_description
   control_library_type = "custom"

examples/ibm-scc/integration/main.tf

@@ -1,4 +1,5 @@
 resource "ibm_scc_provider_type_instance" "scc_provider_type_instance_instance" {
+  instance_id = "00000000-1111-2222-3333-444444444444"
   provider_type_id = var.scc_provider_type_id
   name = var.scc_provider_type_instance_instance
   attributes = var.scc_provider_type_instance_attributes

examples/ibm-scc/profile/main.tf

@@ -3,6 +3,7 @@ data "ibm_scc_control_library" "scc_control_library" {
 }
 
 resource "ibm_scc_profile" "scc_demo_profile" {
+	instance_id = "00000000-1111-2222-3333-444444444444"
 	profile_type = "custom"
 	profile_description = var.ibm_scc_profile_description
 	profile_name = var.ibm_scc_profile_name
@@ -15,6 +16,7 @@ resource "ibm_scc_profile" "scc_demo_profile" {
 }
 
 resource "ibm_scc_profile_attachment" "scc_demo_profile_attachment" {
+	instance_id = "00000000-1111-2222-3333-444444444444"
 	profile_id = resource.ibm_scc_profile.scc_demo_profile.id
 	name = var.ibm_scc_profile_attachment_name
 	description = var.ibm_scc_profile_attachment_description

examples/ibm-scc/report/main.tf

@@ -1,32 +1,40 @@
 data "ibm_scc_latest_reports" "scc_latest_reports_instance" {
+	instance_id = "00000000-1111-2222-3333-444444444444"
 	sort = "profile_name"
 }
 
 data "ibm_scc_report_rule" "scc_report_rule_instance" {
+	instance_id = "00000000-1111-2222-3333-444444444444"
 	report_id = var.scc_report_id
 	rule_id   = var.scc_rule_id
 }
 
 data "ibm_scc_report_tags" "scc_report_tags_instance" {
+	instance_id = "00000000-1111-2222-3333-444444444444"
 	report_id = var.scc_report_id
 }
 
 data "ibm_scc_report_evaluations" "scc_report_evaluations_instance" {
+	instance_id = "00000000-1111-2222-3333-444444444444"
 	report_id = var.scc_report_id
 }
 
 data "ibm_scc_report_controls" "scc_report_controls_instance" {
+	instance_id = "00000000-1111-2222-3333-444444444444"
 	report_id = var.scc_report_id
 }
 
 data "ibm_scc_report_summary" "scc_report_summary_instance" {
+	instance_id = "00000000-1111-2222-3333-444444444444"
 	report_id = var.scc_report_id
 }
 
 data "ibm_scc_report_violation_drift" "scc_report_violation_drift_instance" {
+	instance_id = "00000000-1111-2222-3333-444444444444"
 	report_id = var.scc_report_id
 }
 
 data "ibm_scc_report" "scc_report_instance" {
+	instance_id = "00000000-1111-2222-3333-444444444444"
 	report_id = var.scc_report_id
 }

examples/ibm-scc/rule/main.tf

@@ -1,5 +1,6 @@
 // Provision scc_rule resource instance
 resource "ibm_scc_rule" "scc_rule_tf_demo" {
+	instance_id = "00000000-1111-2222-3333-444444444444"
     description = var.scc_description
     target {
         service_name = "cloud-object-storage"

go.mod

@@ -3,7 +3,7 @@ module github.com/IBM-Cloud/terraform-provider-ibm
 go 1.18
 
 require (
-	github.com/IBM-Cloud/bluemix-go v0.0.0-20230914140903-40534e34a2a5
+	github.com/IBM-Cloud/bluemix-go v0.0.0-20230927110736-d84df0f30e60
 	github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20230822142550-30562e113de9
 	github.com/IBM-Cloud/power-go-client v1.2.4
 	github.com/IBM/apigateway-go-sdk v0.0.0-20210714141226-a5d5d49caaca
@@ -24,10 +24,10 @@ require (
 	github.com/IBM/ibm-hpcs-uko-sdk v0.0.20-beta
 	github.com/IBM/keyprotect-go-client v0.12.2
 	github.com/IBM/networking-go-sdk v0.42.2
-	github.com/IBM/platform-services-go-sdk v0.48.1
+	github.com/IBM/platform-services-go-sdk v0.50.4
 	github.com/IBM/project-go-sdk v0.0.10
 	github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5
-	github.com/IBM/scc-go-sdk/v5 v5.0.2
+	github.com/IBM/scc-go-sdk/v5 v5.1.2
 	github.com/IBM/schematics-go-sdk v0.2.1
 	github.com/IBM/secrets-manager-go-sdk/v2 v2.0.0
 	github.com/IBM/vpc-beta-go-sdk v0.6.0
@@ -54,7 +54,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/rook/rook v1.11.4
 	github.com/softlayer/softlayer-go v1.0.3
-	golang.org/x/crypto v0.9.0
+	golang.org/x/crypto v0.11.0
 	gopkg.in/yaml.v3 v3.0.1
 	gotest.tools v2.2.0+incompatible
 	k8s.io/api v0.26.3
@@ -96,7 +96,7 @@ require (
 	github.com/frankban/quicktest v1.14.3 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-jose/go-jose/v3 v3.0.0 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-openapi/analysis v0.21.2 // indirect
 	github.com/go-openapi/errors v0.20.3 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
@@ -198,11 +198,11 @@ require (
 	github.com/zclconf/go-cty v1.11.0 // indirect
 	go.mongodb.org/mongo-driver v1.11.6 // indirect
 	go.uber.org/ratelimit v0.2.0 // indirect
-	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/net v0.12.0 // indirect
 	golang.org/x/oauth2 v0.7.0 // indirect
-	golang.org/x/sys v0.8.0 // indirect
-	golang.org/x/term v0.8.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
+	golang.org/x/sys v0.10.0 // indirect
+	golang.org/x/term v0.10.0 // indirect
+	golang.org/x/text v0.11.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect