Merge branch 'master' into migration-PR-sdk-test-donot-delete

Author: uibm

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "go.mod|go.sum|.*.map|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2025-07-04T09:35:44Z",
+  "generated_at": "2025-07-09T15:43:07Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -567,6 +567,16 @@
         "verified_result": null
       }
     ],
+    "examples/ibm-is-ng/README.md": [
+      {
+        "hashed_secret": "91199272d5d6a574a51722ca6f3d1148edb1a0e7",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 21,
+        "type": "Secret Keyword",
+        "verified_result": null
+      }
+    ],
     "examples/ibm-lbaas/main.tf": [
       {
         "hashed_secret": "be4fc4886bd949b369d5e092eb87494f12e57e5b",
@@ -812,31 +822,31 @@
         "hashed_secret": "731438016c5ab94431f61820f35e3ae5f8ad6004",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 538,
+        "line_number": 539,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "12da2e35d6b50c902c014f1ab9e3032650368df7",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 544,
+        "line_number": 545,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "165722fe6dd0ec0afbeefb51c8258a177497956b",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 836,
+        "line_number": 837,
         "type": "Hex High Entropy String",
         "verified_result": null
       },
       {
         "hashed_secret": "813274ccae5b6b509379ab56982d862f7b5969b6",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 1483,
+        "line_number": 1491,
         "type": "Base64 High Entropy String",
         "verified_result": null
       }
@@ -924,15 +934,15 @@
         "hashed_secret": "c8b6f5ef11b9223ac35a5663975a466ebe7ebba9",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 2424,
+        "line_number": 2428,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "8abf4899c01104241510ba87685ad4de76b0c437",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 2430,
+        "line_number": 2434,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -3462,15 +3472,15 @@
         "hashed_secret": "18697a00f52cfe022bb910a8a7af9d509114f997",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 114,
+        "line_number": 113,
         "type": "Hex High Entropy String",
         "verified_result": null
       },
       {
         "hashed_secret": "1018de48014135565e13b4b33d5d34cde9d5c23b",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 243,
+        "line_number": 242,
         "type": "Hex High Entropy String",
         "verified_result": null
       }

CHANGELOG.md

@@ -1,3 +1,64 @@
+# 1.80.3 (July 11, 2025)
+## Bug Fixes
+
+### VPC Infrastructure
+* fix(is-bm): fixed bm error on delete ([6346](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6346))
+### CIS
+* fix(CIS): update domain setting proxy read timeout([6347](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6347))
+
+
+# 1.80.2 (July 10, 2025)
+## Bug Fixes
+
+### Global Catalog
+* updated platform services to use local sdk ([6343](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6343))
+
+# 1.80.1 (July 9, 2025)
+
+## Bug Fixes
+
+### Cloud Logs
+* fix alerts metadata_labels ([6306](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6306))
+
+### General
+* Update SDK for MR for Error Format ([6338](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6338))
+
+### Power Systems
+* [Resource] [DataSource] Add Route data sources and resources ([6326](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6326))
+* [Resource] [Datasource] Replace SSH Key API with new API ([6327](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6327))
+
+
+## Enhancements
+
+### Power Systems
+* Deprecate vpn resources ([6317](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6317))
+* [Resource] [Data source] Remove access config and jumbo fields, deprecate network-peer fields ([6319](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6319))
+* Add out_of_band_deleted attribute to terraformvolume data source and resource ([6320](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6320))
+* Add status_detail attribute to ibm_pi_instance_snapshot data source and resource ([6323](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6323))
+* [Datasource] Sap profile filtering ([6324](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6324))
+* [Resource] [Datasource] Granular CRN for pi_placement_group and pi_spp_placement_group resources and datasources ([6325](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6325))
+* [Resource] [Datasource] Add Advertise and ArpBroadcast support ([6322](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6322))
+
+### VPC Infrastructure
+* reorganised VPC examples folder ([6206](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6206))
+* removed redundant code from is_ipsec_policy resource ([6286](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6286))
+
+
+## Documentation
+
+### Cloud Logs
+* Remove access_credential from logs-routing resources ([6332](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6332))
+
+### IAM
+* Improvide wait logic for IAM identity template assignments and correct policy refs field mapping ([6314](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6314))
+
+### Power Systems
+* Update terraform docs with new systems ([6318](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6318))
+
+### VPC Infrastructure
+* added example and related documents ([6296](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/6296))
+
+
 # 1.80.0 (July 4, 2025)
 
 ## Bug Fixes

examples/ibm-is-flow-log/README.md

@@ -1,43 +1,59 @@
-# Example for VPC Flow Logs resources
+# IBM Cloud VPC Flow Logs Example
 
-This example shows how to create Flow Logs for VPC resources.
+This example demonstrates how to create Flow Logs for IBM Cloud VPC resources. Flow logs capture network traffic information for analysis, security auditing, and troubleshooting.
 
-Following types of resources are supported:
+## Supported Resources
 
-* [Flow Logs](https://cloud.ibm.com/docs/terraform)
+* [Flow Logs](https://cloud.ibm.com/docs/vpc?topic=vpc-flow-logs)
 
+## Terraform Compatibility
 
-## Terraform versions
+* Terraform 0.12 or later (for current branch - `master`)
+* For Terraform 0.11 compatibility, use branch `terraform_v0.11.x`
 
-Terraform 0.12. Pin module version to `~> v1.5.1`. Branch - `master`.
+## Usage
 
-Terraform 0.11. Pin module version to `~> v0.27.0`. Branch - `terraform_v0.11.x`.
+To run this example, execute:
 
-## Usage
+```bash
+terraform init
+terraform plan
+terraform apply
+```
 
-To run this example you need to execute:
+To remove the created resources:
 
 ```bash
-$ terraform init
-$ terraform plan
-$ terraform apply
+terraform destroy
 ```
 
-Run `terraform destroy` when you don't need these resources.
+## Implementation Details
+
+This example creates:
+
+1. A Cloud Object Storage instance to store the flow logs
+2. A bucket within that instance
+3. A Flow Log collector targeting a VPC instance
+4. Required permissions between the collector and the bucket
 
-## Example Usage
+### How Flow Logs Work
 
-Create a Flow log:
+VPC Flow Logs capture network traffic information (IP addresses, protocols, ports) going to and from network interfaces within your VPC. The data is sent to a specified Cloud Object Storage bucket for later retrieval and analysis.
+
+## Example Configuration
 
 ```hcl
+# Get resource group for Cloud Object Storage
 data "ibm_resource_group" "cos_group" {
   name = var.resource_group
 }
 
+# Get information about an existing instance
 data "ibm_is_instance" "ds_instance" {
-  name        = "vpc1-instance"
+  name = "vpc1-instance"
 }
 
+# Create a Cloud Object Storage service instance
 resource "ibm_resource_instance" "instance1" {
   name              = "cos-instance"
   resource_group_id = data.ibm_resource_group.cos_group.id
@@ -46,14 +62,16 @@ resource "ibm_resource_instance" "instance1" {
   location          = "global"
 }
 
+# Create a bucket for storing flow logs
 resource "ibm_cos_bucket" "bucket1" {
    bucket_name          = "us-south-bucket-vpc1"
    resource_instance_id = ibm_resource_instance.instance1.id
    region_location = var.region
    storage_class = "standard"
 }
 
-resource ibm_is_flow_log test_flowlog {
+# Create a flow log collector for an instance
+resource "ibm_is_flow_log" "test_flowlog" {
   depends_on = [ibm_cos_bucket.bucket1]
   name = "test-instance-flow-log"
   target = data.ibm_is_instance.ds_instance.id
@@ -62,31 +80,23 @@ resource ibm_is_flow_log test_flowlog {
 }
 ```
 
-## Examples
-
-* [ Flow Log ](https://github.com/IBM-Cloud/terraform-provider-ibm/tree/master/examples/ibm-is-flow-log)
-
-<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
-## Requirements
+## Additional Resources
 
-| Name | Version |
-|------|---------|
-| terraform | ~> 0.12 |
+* [IBM Cloud Flow Logs Documentation](https://cloud.ibm.com/docs/vpc?topic=vpc-flow-logs)
+* [IBM Terraform Provider Examples](https://github.com/IBM-Cloud/terraform-provider-ibm/tree/master/examples/ibm-is-flow-log)
 
-## Providers
-
-| Name | Version |
-|------|---------|
-| ibm | n/a |
-
-## Inputs
+## Input Parameters
 
 | Name | Description | Type | Required |
 |------|-------------|------|---------|
-| name | The unique user-defined name for this flow log collector. | `string` | yes |
-| target | The id of the target this collector is to collect flow logs for. If the target is an instance, subnet, or VPC, flow logs will not be collected for any network interfaces within the target that are themselves the target of a more specific flow log collector. | `string` | yes |
-| storage\_bucket | The name of the Cloud Object Storage bucket where the collected flows will be logged. The bucket must exist and an IAM service authorization must grant IBM Cloud Flow Logs resources of VPC Infrastructure Services writer access to the bucket. | `string` | yes |
-| active | Indicates whether this collector is active. If false, this collector is created in inactive mode. Default is true. | `boolean` | no |
-| resource\_group | The resource group ID where the flow log is to be created. | `string` | no |
+| name | The unique user-defined name for the flow log collector | `string` | yes |
+| target | The ID of the target to collect flow logs for | `string` | yes |
+| storage\_bucket | The name of the Cloud Object Storage bucket for log storage | `string` | yes |
+| active | Whether this collector is active (default: true) | `boolean` | no |
+| resource\_group | The resource group ID for the flow log | `string` | no |
+
+## Notes
 
-<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+* An IAM service authorization must be in place to grant VPC Flow Logs services write access to the bucket
+* Flow logs can be created for instances, subnets, or entire VPCs
+* More specific flow log collectors take precedence over less specific ones

examples/ibm-is-flow-log/main.tf

@@ -1,35 +1,60 @@
+# ==========================================================================
+# Flow Logs Configuration
+# ==========================================================================
 
+# ==========================================================================
+# Data Sources
+# ==========================================================================
+
+# Get resource group for Cloud Object Storage
 data "ibm_resource_group" "cos_group" {
-  name = var.resource_group
+  name = var.resource_group # Use resource group name from variable
 }
 
+# Get information about an existing instance
 data "ibm_is_instance" "ds_instance" {
-  name        = "vpc1-instance"
+  name = "vpc1-instance" # Target instance for flow logs
 }
 
+# ==========================================================================
+# Cloud Object Storage Resources
+# ==========================================================================
+
+# Create a Cloud Object Storage service instance
 resource "ibm_resource_instance" "instance1" {
-  name              = "cos-instance"
-  resource_group_id = data.ibm_resource_group.cos_group.id
-  service           = "cloud-object-storage"
-  plan              = "standard"
-  location          = "global"
+  name              = "cos-instance"                       # Name for the COS instance
+  resource_group_id = data.ibm_resource_group.cos_group.id # Resource group for COS
+  service           = "cloud-object-storage"               # IBM Cloud service type
+  plan              = "standard"                           # Service plan
+  location          = "global"                             # Global service
 }
 
+# Create a bucket for storing flow logs
 resource "ibm_cos_bucket" "bucket1" {
-   bucket_name          = "us-south-bucket-vpc1"
-   resource_instance_id = ibm_resource_instance.instance1.id
-   region_location = var.region
-   storage_class = "standard"
+  bucket_name          = "us-south-bucket-vpc1"             # Name of the bucket
+  resource_instance_id = ibm_resource_instance.instance1.id # COS instance
+  region_location      = var.region                         # Region for the bucket
+  storage_class        = "standard"                         # Storage class (standard, vault, cold, smart)
 }
 
-resource ibm_is_flow_log test_flowlog {
-  depends_on = [ibm_cos_bucket.bucket1]
-  name = "test-instance-flow-log"
-  target = data.ibm_is_instance.ds_instance.id
-  active = true
-  storage_bucket = ibm_cos_bucket.bucket1.bucket_name
+# ==========================================================================
+# Flow Log Resources
+# ==========================================================================
+
+# Create a flow log collector for an instance
+resource "ibm_is_flow_log" "test_flowlog" {
+  depends_on     = [ibm_cos_bucket.bucket1]            # Create after bucket is available
+  name           = "test-instance-flow-log"            # Name for the flow log
+  target         = data.ibm_is_instance.ds_instance.id # Target instance to collect logs for
+  active         = true                                # Flow log collector is active
+  storage_bucket = ibm_cos_bucket.bucket1.bucket_name  # Bucket where logs will be stored
 }
 
-data ibm_is_flow_logs "test_flow_logs" {
+# ==========================================================================
+# Flow Log Data Sources
+# ==========================================================================
 
-}
+# List all flow logs
+data "ibm_is_flow_logs" "test_flow_logs" {
+  # No filters specified - will return all flow logs
+}