Skip to content

Commit

Permalink
Merge branch 'master' into vsi-lifecycle-status-reasons
Browse files Browse the repository at this point in the history
  • Loading branch information
uibm committed Sep 15, 2022
2 parents 8c2f519 + 3156ea6 commit 6034d78
Show file tree
Hide file tree
Showing 12 changed files with 33 additions and 45 deletions.
58 changes: 20 additions & 38 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "go.sum|^.secrets.baseline$|metadata",
"lines": null
},
"generated_at": "2022-09-05T12:30:29Z",
"generated_at": "2022-09-14T12:58:43Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -307,16 +307,6 @@
"verified_result": null
}
],
"examples/ibm-cd-tekton-pipeline/README.md": [
{
"hashed_secret": "7964264efab8ce11653cec07a2c472d973123783",
"is_secret": false,
"is_verified": false,
"line_number": 73,
"type": "Secret Keyword",
"verified_result": null
}
],
"examples/ibm-cis/README.md": [
{
"hashed_secret": "1f1c2ad5fded044aae42281c1fd4253dd624bf65",
Expand Down Expand Up @@ -678,39 +668,39 @@
"hashed_secret": "c427f185ddcb2440be9b77c8e45f1cd487a2e790",
"is_secret": false,
"is_verified": false,
"line_number": 1392,
"line_number": 1396,
"type": "Base64 High Entropy String",
"verified_result": null
},
{
"hashed_secret": "1f7e33de15e22de9d2eaf502df284ed25ca40018",
"is_secret": false,
"is_verified": false,
"line_number": 1460,
"line_number": 1464,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "1f614c2eb6b3da22d89bd1b9fd47d7cb7c8fc670",
"is_secret": false,
"is_verified": false,
"line_number": 3177,
"line_number": 3181,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "7abfce65b8504403afc25c9790f358d513dfbcc6",
"is_secret": false,
"is_verified": false,
"line_number": 3190,
"line_number": 3194,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "0c2d85bf9a9b1579b16f220a4ea8c3d62b2e24b1",
"is_secret": false,
"is_verified": false,
"line_number": 3231,
"line_number": 3235,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -740,15 +730,15 @@
"hashed_secret": "c8b6f5ef11b9223ac35a5663975a466ebe7ebba9",
"is_secret": false,
"is_verified": false,
"line_number": 1440,
"line_number": 1449,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "8abf4899c01104241510ba87685ad4de76b0c437",
"is_secret": false,
"is_verified": false,
"line_number": 1446,
"line_number": 1455,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -1030,7 +1020,7 @@
"hashed_secret": "17f5f58d3d8d9871c52ab032989df3d810d2443e",
"is_secret": false,
"is_verified": false,
"line_number": 358,
"line_number": 368,
"type": "Secret Keyword",
"verified_result": null
}
Expand All @@ -1040,7 +1030,7 @@
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
"is_secret": false,
"is_verified": false,
"line_number": 384,
"line_number": 385,
"type": "Secret Keyword",
"verified_result": null
}
Expand All @@ -1058,7 +1048,7 @@
"hashed_secret": "b732fb611fd46a38e8667f9972e0cde777fbe37f",
"is_secret": false,
"is_verified": false,
"line_number": 463,
"line_number": 478,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -2368,7 +2358,7 @@
"hashed_secret": "49f3bb8f759241df51c899d3725d877bad58f66e",
"is_secret": false,
"is_verified": false,
"line_number": 1222,
"line_number": 1229,
"type": "Secret Keyword",
"verified_result": null
}
Expand All @@ -2378,15 +2368,15 @@
"hashed_secret": "49f3bb8f759241df51c899d3725d877bad58f66e",
"is_secret": false,
"is_verified": false,
"line_number": 1402,
"line_number": 1414,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "b732fb611fd46a38e8667f9972e0cde777fbe37f",
"is_secret": false,
"is_verified": false,
"line_number": 1405,
"line_number": 1417,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -2586,15 +2576,15 @@
"hashed_secret": "d47dcacc720a39e236679ac3e311a0d58bb6519e",
"is_secret": false,
"is_verified": false,
"line_number": 190,
"line_number": 199,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "e66e7d67fdf3c596c435fc7828b13205e4950a0f",
"is_secret": false,
"is_verified": false,
"line_number": 192,
"line_number": 201,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -2640,15 +2630,15 @@
"hashed_secret": "d47dcacc720a39e236679ac3e311a0d58bb6519e",
"is_secret": false,
"is_verified": false,
"line_number": 164,
"line_number": 163,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "e66e7d67fdf3c596c435fc7828b13205e4950a0f",
"is_secret": false,
"is_verified": false,
"line_number": 166,
"line_number": 165,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -2977,7 +2967,7 @@
],
"website/docs/r/cd_toolchain_tool_privateworker.html.markdown": [
{
"hashed_secret": "90a487e543acb2a46de4f28f6012de33bb854568",
"hashed_secret": "5eab76877b1da92f740d94b7410daeeb18f1e919",
"is_secret": false,
"is_verified": false,
"line_number": 21,
Expand Down Expand Up @@ -3038,14 +3028,6 @@
}
],
"website/docs/r/cd_toolchain_tool_securitycompliance.html.markdown": [
{
"hashed_secret": "505032eaf8a3acf9b094a326dfb1cd0537c75a0d",
"is_secret": false,
"is_verified": false,
"line_number": 25,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "d47dcacc720a39e236679ac3e311a0d58bb6519e",
"is_secret": false,
Expand Down Expand Up @@ -3408,7 +3390,7 @@
}
]
},
"version": "0.13.1+ibm.51.dss",
"version": "0.13.1+ibm.50.dss",
"word_list": {
"file": null,
"hash": null
Expand Down
2 changes: 1 addition & 1 deletion website/docs/d/app_config_segment.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ subcategory: 'App Configuration'
layout: 'ibm'
page_title: 'IBM : App Configuration segment'
description: |-
Get information about segment
Get information about segment
---

# ibm_app_config_segment
Expand Down
2 changes: 1 addition & 1 deletion website/docs/d/app_config_segments.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ subcategory: 'App Configuration'
layout: 'ibm'
page_title: 'IBM : App Configuration segments'
description: |-
List all the segments.
List all the segments.
---

# ibm_app_config_segments
Expand Down
2 changes: 1 addition & 1 deletion website/docs/d/cos_bucket.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ In addition to all argument reference list, you can access the following attribu
- `abort_incomplete_multipart_upload_days` (List) Nested block with the following structure.

Nested scheme for `abort_incomplete_multipart_upload_days`:
- `days_after_initiation` - (String) Specifies the number of days that govern the automatic cancellation of part upload. Clean up incomplete multi-part uploads after a period of time. Must be a value greater than 0.
- `days_after_initiation` - (Integer) Specifies the number of days that govern the automatic cancellation of part upload. Clean up incomplete multi-part uploads after a period of time. Must be a value greater than 0.
- `enable` - (Bool) A rule can either be `enabled` or `disabled`. A rule is active only when enabled.
- `prefix` - (String) A rule with a prefix will only apply to the objects that match. You can use multiple rules for different actions for different prefixes within the same bucket.
- `rule_id` - (String) Unique identifier for the rule. Rules allow you to set a specific time frame after which objects are deleted. Set Rule ID for cos bucket.
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/app_config_segment.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ subcategory: 'App Configuration'
layout: 'ibm'
page_title: 'IBM : App Configuration segment'
description: |-
Manages segment.
Manages segment.
---

# ibm_app_config_segment
Expand Down
7 changes: 7 additions & 0 deletions website/docs/r/cos_bucket.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,13 @@ resource "ibm_cos_bucket" "cos_bucket" {
## Argument reference
Review the argument references that you can specify for your resource.

- `abort_incomplete_multipart_upload_days` (Optional,List) Nested block with the following structure.

Nested scheme for `abort_incomplete_multipart_upload_days`:
- `days_after_initiation` - (Optional, Integer) Specifies the number of days that govern the automatic cancellation of part upload. Clean up incomplete multi-part uploads after a period of time. Must be a value greater than 0 and less than 3650.
- `enable` - (Required, Bool) A rule can either be `enabled` or `disabled`. A rule is active only when enabled.
- `prefix` - (Optional, String) A rule with a prefix will only apply to the objects that match. You can use multiple rules for different actions for different prefixes within the same bucket.
- `rule_id` - (Optional, String) Unique identifier for the rule. Rules allow you to set a specific time frame after which objects are deleted. Set Rule ID for cos bucket.
- `allowed_ip` - (Optional, Array of string) A list of IPv4 or IPv6 addresses in CIDR notation that you want to allow access to your IBM Cloud Object Storage bucket.
- `activity_tracking`- (List of objects) Object to enable auditing with IBM Cloud Activity Tracker - Optional - Configure your IBM Cloud Activity Tracker service instance and the type of events that you want to send to your service to audit activity against your bucket. For a list of supported actions, see [Bucket actions](https://cloud.ibm.com/docs/cloud-object-storage?topic=cloud-object-storage-at-events#at-actions-mngt-2).

Expand Down
5 changes: 2 additions & 3 deletions website/docs/r/kms_key.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ This resource can be used for management of keys in both Key Protect and Hyper P
After creating an Hyper Protect Crypto Service instance you need to initialize the instance properly with the crypto units, in order to create, or manage Hyper Protect Crypto Service keys. For more information, about how to initialize the Hyper Protect Crypto Service instance, see [Initialize Hyper Protect Crypto](https://cloud.ibm.com/docs/hs-crypto?topic=hs-crypto-initialize-hsm) only for HPCS instance.


~> **Deprecated:**

The ability to use the ibm_kms_key resource to create or update key policies in Terraform has been removed in favor of a dedicated ibm_kms_key_policies resource. For more information, check out [here](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/kms_key_policies#example-usage-to-create-a-[…]and-associate-a-key-policy)
~>**Deprecated:**
The ability to use the ibm_kms_key resource to create or update key policies in Terraform has been removed in favor of a dedicated ibm_kms_key_policies resource. For more information, check out [here](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/kms_key_policies#example-usage-to-create-a-[…]and-associate-a-key-policy)


## Example usage to provision Key Protect service and key management
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 6034d78

Please sign in to comment.