Skip to content

Commit

Permalink
Merge branch 'master' into stratos-changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@ismirlia
ismirlia authored Nov 23, 2023
2 parents fd3ef4c + ff439a9 commit 7124b65
Show file tree
Hide file tree
Showing 57 changed files with 2,727 additions and 454 deletions.
118 changes: 84 additions & 34 deletions .secrets.baseline
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "go.mod|go.sum|.*.map|^.secrets.baseline$",
"lines": null
},
"generated_at": "2023-11-10T20:51:53Z",
"generated_at": "2023-11-22T09:50:41Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -560,7 +560,7 @@
"hashed_secret": "06d988e96c3d9325c9fbc7c0ef3c6c0f2b4eb8e7",
"is_secret": false,
"is_verified": false,
"line_number": 13,
"line_number": 45,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -760,23 +760,23 @@
"hashed_secret": "731438016c5ab94431f61820f35e3ae5f8ad6004",
"is_secret": false,
"is_verified": false,
"line_number": 412,
"line_number": 416,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "12da2e35d6b50c902c014f1ab9e3032650368df7",
"is_secret": false,
"is_verified": false,
"line_number": 418,
"line_number": 422,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "813274ccae5b6b509379ab56982d862f7b5969b6",
"is_secret": false,
"is_verified": false,
"line_number": 1123,
"line_number": 1127,
"type": "Base64 High Entropy String",
"verified_result": null
}
Expand Down Expand Up @@ -846,15 +846,15 @@
"hashed_secret": "da8cae6284528565678de15e03d461e23fe22538",
"is_secret": false,
"is_verified": false,
"line_number": 1845,
"line_number": 1858,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "1a0334cfa65f4be58b9d914b8e96e9d9478bfbac",
"is_secret": false,
"is_verified": false,
"line_number": 3226,
"line_number": 3239,
"type": "Secret Keyword",
"verified_result": null
}
Expand All @@ -864,15 +864,15 @@
"hashed_secret": "c8b6f5ef11b9223ac35a5663975a466ebe7ebba9",
"is_secret": false,
"is_verified": false,
"line_number": 1803,
"line_number": 1806,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "8abf4899c01104241510ba87685ad4de76b0c437",
"is_secret": false,
"is_verified": false,
"line_number": 1809,
"line_number": 1812,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -1268,15 +1268,7 @@
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
"is_secret": false,
"is_verified": false,
"line_number": 129,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "505032eaf8a3acf9b094a326dfb1cd0537c75a0d",
"is_secret": false,
"is_verified": false,
"line_number": 235,
"line_number": 104,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -1364,15 +1356,7 @@
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
"is_secret": false,
"is_verified": false,
"line_number": 94,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "505032eaf8a3acf9b094a326dfb1cd0537c75a0d",
"is_secret": false,
"is_verified": false,
"line_number": 364,
"line_number": 68,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -2014,7 +1998,7 @@
"hashed_secret": "884a58e4c2c5d195d3876787bdc63af6c5af2924",
"is_secret": false,
"is_verified": false,
"line_number": 1589,
"line_number": 1595,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -2834,15 +2818,15 @@
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
"is_secret": false,
"is_verified": false,
"line_number": 190,
"line_number": 334,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "92f08f2d9a0dc3f0d4cb3796435a48508cf59ecd",
"is_secret": false,
"is_verified": false,
"line_number": 461,
"line_number": 654,
"type": "Secret Keyword",
"verified_result": null
}
Expand All @@ -2857,20 +2841,48 @@
"verified_result": null
}
],
"ibm/service/project/data_source_ibm_project_environment.go": [
{
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
"is_secret": false,
"is_verified": false,
"line_number": 119,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "92f08f2d9a0dc3f0d4cb3796435a48508cf59ecd",
"is_secret": false,
"is_verified": false,
"line_number": 293,
"type": "Secret Keyword",
"verified_result": null
}
],
"ibm/service/project/data_source_ibm_project_environment_test.go": [
{
"hashed_secret": "347cd9c53ff77d41a7b22aa56c7b4efaf54658e3",
"is_secret": false,
"is_verified": false,
"line_number": 55,
"type": "Secret Keyword",
"verified_result": null
}
],
"ibm/service/project/resource_ibm_project_config.go": [
{
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
"is_secret": false,
"is_verified": false,
"line_number": 92,
"line_number": 236,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "92f08f2d9a0dc3f0d4cb3796435a48508cf59ecd",
"is_secret": false,
"is_verified": false,
"line_number": 693,
"line_number": 884,
"type": "Secret Keyword",
"verified_result": null
}
Expand All @@ -2885,6 +2897,34 @@
"verified_result": null
}
],
"ibm/service/project/resource_ibm_project_environment.go": [
{
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
"is_secret": false,
"is_verified": false,
"line_number": 72,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "92f08f2d9a0dc3f0d4cb3796435a48508cf59ecd",
"is_secret": false,
"is_verified": false,
"line_number": 504,
"type": "Secret Keyword",
"verified_result": null
}
],
"ibm/service/project/resource_ibm_project_environment_test.go": [
{
"hashed_secret": "347cd9c53ff77d41a7b22aa56c7b4efaf54658e3",
"is_secret": false,
"is_verified": false,
"line_number": 62,
"type": "Secret Keyword",
"verified_result": null
}
],
"ibm/service/pushnotification/resource_ibm_push_notification_chrome.go": [
{
"hashed_secret": "8a4036fbf3e13c7a84bac77ddae25de1cdfc4d43",
Expand Down Expand Up @@ -2940,7 +2980,7 @@
"hashed_secret": "3c2ecad9b250fd6d99893e4d05ec02ca19aa95d0",
"is_secret": false,
"is_verified": false,
"line_number": 383,
"line_number": 389,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -4466,7 +4506,17 @@
"hashed_secret": "06d988e96c3d9325c9fbc7c0ef3c6c0f2b4eb8e7",
"is_secret": false,
"is_verified": false,
"line_number": 23,
"line_number": 22,
"type": "Secret Keyword",
"verified_result": null
}
],
"website/docs/r/project_environment.html.markdown": [
{
"hashed_secret": "06d988e96c3d9325c9fbc7c0ef3c6c0f2b4eb8e7",
"is_secret": false,
"is_verified": false,
"line_number": 22,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down
42 changes: 42 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,45 @@
# 1.60.0-beta1 (Nov 23, 2023)
Features
* Support for Projects
- **Datasources**
- ibm_project
- ibm_project_config
- ibm_project_environment
- **Resources**
- ibm_project
- ibm_project_config
- ibm_project_environment

* Support for Code Engine
- **Datasources**
- ibm_code_engine_domain_mapping
- **Resources**
- ibm_code_engine_domain_mapping

* Support for Power Instance
- **Resources**
- ibm_pi_workspace

Enhancements
* support offline restore for MongoDB EE PITR ([4601](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4601))
* bump ContinuousDelivery Go SDK version ([4918](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4918))
* Added nest conditions to rule.conditions IAM Policies ([4896](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4896))
* Updates to SCC tool ([4920](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4920))
* Add entitlement option to Satellite cluster/workerpool create ([4894](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4894))
* VPC ID Filter is added when Subnet Name is specified ([4892](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4892))
* add optional account id to kms config ([4944](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4944))

BugFixes
* resolved nil pointer issue on vpn gateway resource ([4903](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4903))
* Private/direct COS endpoint settings conflicts with IBM Cloud docs, VPE options, and COS config endpoint ([4919](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4919))
* add missing required argument name to the doc ([4909](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4909))
* Fix wrong sintax in doc for Ingress Secret Opaque ([4917](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4917))
* schematics agent doc fixes ([4933](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4933))
* Fix some job parameters for code engine ([4923](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4923))
* CIS - remove deafult value for min_tls_version ([4947](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4947))
* Update Power Workspace/s and Datacenter/s DataSource Documentation ([4904](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4904))
* validation on encryption with catalog images fixed ([4940](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/4940))

# 1.60.0-beta0 (Nov 15, 2023)
Features
* Support for Projects
Expand Down
2 changes: 1 addition & 1 deletion examples/ibm-code-engine/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ data "ibm_code_engine_domain_mapping" "code_engine_domain_mapping_instance" {
| data | The key-value pair for the config map. Values must be specified in `KEY=VALUE` format. Each `KEY` field must consist of alphanumeric characters, `-`, `_` or `.` and must not be exceed a max length of 253 characters. Each `VALUE` field can consists of any character and must not be exceed a max length of 1048576 characters. | `map(string)` | false |
| image_reference | The name of the image that is used for this job. The format is `REGISTRY/NAMESPACE/REPOSITORY:TAG` where `REGISTRY` and `TAG` are optional. If `REGISTRY` is not specified, the default is `docker.io`. If `TAG` is not specified, the default is `latest`. If the image reference points to a registry that requires authentication, make sure to also specify the property `image_secret`. | `string` | true |
| image_secret | The name of the image registry access secret. The image registry access secret is used to authenticate with a private registry when you download the container image. If the image reference points to a registry that requires authentication, the job / job runs will be created but submitted job runs will fail, until this property is provided, too. This property must not be set on a job run, which references a job template. | `string` | false |
| run_mode | The mode for runs of the job. Valid values are `task` and `daemon`. In `task` mode, the `max_execution_time` and `retry_limit` properties apply. In `daemon` mode, since there is no timeout and failed instances are restarted indefinitely, the `max_execution_time` and `retry_limit` properties are not allowed. | `string` | false |
| run_mode | The mode for runs of the job. Valid values are `task` and `daemon`. In `task` mode, the `scale_max_execution_time` and `scale_retry_limit` properties apply. In `daemon` mode, since there is no timeout and failed instances are restarted indefinitely, the `scale_max_execution_time` and `scale_retry_limit` properties are not allowed. | `string` | false |
| scale_array_spec | Define a custom set of array indices as comma-separated list containing single values and hyphen-separated ranges like `5,12-14,23,27`. Each instance can pick up its array index via environment variable `JOB_INDEX`. The number of unique array indices specified here determines the number of job instances to run. | `string` | false |
| scale_max_execution_time | The maximum execution time in seconds for runs of the job. This property can only be specified if `run_mode` is `task`. | `number` | false |
| scale_memory_limit | Optional amount of memory set for the instance of the job. For valid values see [Supported memory and CPU combinations](https://cloud.ibm.com/docs/codeengine?topic=codeengine-mem-cpu-combo). The units for specifying memory are Megabyte (M) or Gigabyte (G), whereas G and M are the shorthand expressions for GB and MB. For more information see [Units of measurement](https://cloud.ibm.com/docs/codeengine?topic=codeengine-mem-cpu-combo#unit-measurements). | `string` | false |
Expand Down
27 changes: 23 additions & 4 deletions examples/ibm-project/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ The following types of resources are supported:

* project_config
* project
* project_environment

## Usage

Expand Down Expand Up @@ -39,6 +40,14 @@ resource "project" "project_instance" {
definition = var.project_definition
}
```
project_environment resource:

```hcl
resource "project_environment" "project_environment_instance" {
project_id = ibm_project.project_instance.project_id
definition = var.project_environment_definition
}
```

## ProjectV1 data sources

Expand All @@ -57,6 +66,14 @@ data "project" "project_instance" {
project_id = ibm_project.project_instance.id
}
```
project_environment data source:

```hcl
data "ibm_project_environment" "project_environment_instance" {
project_id = ibm_project_environment.project_environment_instance.project_id
project_environment_id = ibm_project_environment.project_environment_instance.project_environment_id
}
```

## Assumptions

Expand Down Expand Up @@ -84,18 +101,20 @@ data "project" "project_instance" {
|------|-------------|------|---------|
| ibmcloud\_api\_key | IBM Cloud API key | `string` | true |
| project_id | The unique project ID. | `string` | true |
| schematics | A schematics workspace associated to a project configuration. | `` | false |
| definition | The type and output of a project configuration. | `` | true |
| schematics | A schematics workspace associated to a project configuration, with scripts. | `` | false |
| definition | The name and description of a project configuration. | `` | true |
| location | The IBM Cloud location where a resource is deployed. | `string` | true |
| resource_group | The resource group where the project's data and tools are created. | `string` | true |
| resource_group | The resource group name where the project's data and tools are created. | `string` | true |
| definition | The definition of the project. | `` | true |
| definition | The environment definition. | `` | true |
| project_id | The unique project ID. | `string` | true |
| project_config_id | The unique config ID. | `string` | true |
| project_id | The unique project ID. | `string` | true |
| project_environment_id | The environment ID. | `string` | true |

## Outputs

| Name | Description |
|------|-------------|
| project_config | project_config object |
| project | project object |
| project_environment | project_environment object |
Loading

0 comments on commit 7124b65

Please sign in to comment.