Skip to content

Commit 5655491

Browse files
GokceGKGokceGK
authored
Merge branch 'main' into sqlserverflex-sdk-update
2 parents 4ff5b2b + 2adf8f0 commit 5655491

File tree

24 files changed

+1300
-301
lines changed

24 files changed

+1300
-301
lines changed

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -222,12 +222,12 @@ Terraform acceptance tests are run using the command `make test-acceptance-tf`.
222222

223223
Additionally:
224224

225-
| Env var | Value | Example value | needed for Acc tests of the following services |
226-
|---------------------------------------------|---------------------------------------------------------------------------------------------------------|----------------------------------------|------------------------------------------------|
227-
| `TF_ACC_ORGANIZATION_ID` | ID of the STACKIT test organization | `5353ccfa-a984-4b96-a71d-b863dd2b7087` | `authorization`, `iaas` |
228-
| `TF_ACC_TEST_PROJECT_SERVICE_ACCOUNT_EMAIL` | Email of the STACKIT service account | `abc-serviceaccount@sa.stackit.cloud` | `authorization`, `resourcemanager` | |
229-
| `TF_ACC_TEST_PROJECT_PARENT_CONTAINER_ID` | Container ID of the project parent container (folder within an organization or the organization itself) | `organization-d2b7087` | `resourcemanager` |
230-
| `TF_ACC_TEST_PROJECT_PARENT_UUID` | UUID ID of the project parent container (folder within an organization or the organization itself) | `5353ccfa-a984-4b96-a71d-b863dd2b7087` | `resourcemanager` |
225+
| Env var | Value | Example value | needed for Acc tests of the following services |
226+
|---------------------------------------------|---------------------------------------------------------------------------------------------------------|----------------------------------------|--------------------------------------------------------------|
227+
| `TF_ACC_ORGANIZATION_ID` | ID of the STACKIT test organization | `5353ccfa-a984-4b96-a71d-b863dd2b7087` | `authorization`, `iaas` |
228+
| `TF_ACC_TEST_PROJECT_SERVICE_ACCOUNT_EMAIL` | Email of the STACKIT service account | `abc-serviceaccount@sa.stackit.cloud` | `authorization`, `iaas`, `resourcemanager`, `secretsmanager` |
229+
| `TF_ACC_TEST_PROJECT_PARENT_CONTAINER_ID` | Container ID of the project parent container (folder within an organization or the organization itself) | `organization-d2b7087` | `resourcemanager` |
230+
| `TF_ACC_TEST_PROJECT_PARENT_UUID` | UUID ID of the project parent container (folder within an organization or the organization itself) | `5353ccfa-a984-4b96-a71d-b863dd2b7087` | `resourcemanager` |
231231

232232
### Run Acceptance Tests of a single service
233233

‎docs/data-sources/objectstorage_compliance_lock.md‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
---
2+
# generated by https://github.com/hashicorp/terraform-plugin-docs
3+
page_title: "stackit_objectstorage_compliance_lock Data Source - stackit"
4+
subcategory: ""
5+
description: |-
6+
ObjectStorage compliance lock resource schema. Must have a region specified in the provider configuration.
7+
---
8+
9+
# stackit_objectstorage_compliance_lock (Data Source)
10+
11+
ObjectStorage compliance lock resource schema. Must have a `region` specified in the provider configuration.
12+
13+
## Example Usage
14+
15+
```terraform
16+
data "stackit_objectstorage_compliance_lock" "example" {
17+
project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
18+
}
19+
```
20+
21+
<!-- schema generated by tfplugindocs -->
22+
## Schema
23+
24+
### Required
25+
26+
- `project_id` (String) STACKIT Project ID to which the compliance lock is associated.
27+
28+
### Optional
29+
30+
- `region` (String) The resource region. If not defined, the provider region is used.
31+
32+
### Read-Only
33+
34+
- `id` (String) Terraform's internal resource identifier. It is structured as "`project_id`,`region`".
35+
- `max_retention_days` (Number) Maximum retention period in days.

‎docs/data-sources/secretsmanager_instance.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,15 @@ data "stackit_secretsmanager_instance" "example" {
3131

3232
- `acls` (Set of String) The access control list for this instance. Each entry is an IP or IP range that is permitted to access, in CIDR notation
3333
- `id` (String) Terraform's internal resource ID. It is structured as "`project_id`,`instance_id`".
34+
- `kms_key` (Attributes) The STACKIT-KMS key for secret encryption and decryption. (see [below for nested schema](#nestedatt--kms_key))
3435
- `name` (String) Instance name.
36+
37+
<a id="nestedatt--kms_key"></a>
38+
### Nested Schema for `kms_key`
39+
40+
Read-Only:
41+
42+
- `key_id` (String) UUID of the key within the STACKIT-KMS to use for the encryption.
43+
- `key_ring_id` (String) UUID of the keyring where the key is located within the STACKTI-KMS.
44+
- `key_version` (Number) Version of the key within the STACKIT-KMS to use for the encryption.
45+
- `service_account_email` (String) Service-Account linked to the Key within the STACKIT-KMS.

‎docs/resources/objectstorage_compliance_lock.md‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
---
2+
# generated by https://github.com/hashicorp/terraform-plugin-docs
3+
page_title: "stackit_objectstorage_compliance_lock Resource - stackit"
4+
subcategory: ""
5+
description: |-
6+
ObjectStorage compliance lock resource schema. Must have a region specified in the provider configuration. Always use only one compliance lock per project.
7+
---
8+
9+
# stackit_objectstorage_compliance_lock (Resource)
10+
11+
ObjectStorage compliance lock resource schema. Must have a `region` specified in the provider configuration. Always use only one compliance lock per project.
12+
13+
## Example Usage
14+
15+
```terraform
16+
resource "stackit_objectstorage_compliance_lock" "example" {
17+
project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
18+
}
19+
```
20+
21+
<!-- schema generated by tfplugindocs -->
22+
## Schema
23+
24+
### Required
25+
26+
- `project_id` (String) STACKIT Project ID to which the compliance lock is associated.
27+
28+
### Optional
29+
30+
- `region` (String) The resource region. If not defined, the provider region is used.
31+
32+
### Read-Only
33+
34+
- `id` (String) Terraform's internal resource identifier. It is structured as "`project_id`,`region`".
35+
- `max_retention_days` (Number) Maximum retention period in days.

‎docs/resources/secretsmanager_instance.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,19 @@ import {
3737
### Optional
3838

3939
- `acls` (Set of String) The access control list for this instance. Each entry is an IP or IP range that is permitted to access, in CIDR notation
40+
- `kms_key` (Attributes) The STACKIT-KMS key for secret encryption and decryption. (see [below for nested schema](#nestedatt--kms_key))
4041

4142
### Read-Only
4243

4344
- `id` (String) Terraform's internal resource ID. It is structured as "`project_id`,`instance_id`".
4445
- `instance_id` (String) ID of the Secrets Manager instance.
46+
47+
<a id="nestedatt--kms_key"></a>
48+
### Nested Schema for `kms_key`
49+
50+
Required:
51+
52+
- `key_id` (String) UUID of the key within the STACKIT-KMS to use for the encryption.
53+
- `key_ring_id` (String) UUID of the keyring where the key is located within the STACKTI-KMS.
54+
- `key_version` (Number) Version of the key within the STACKIT-KMS to use for the encryption.
55+
- `service_account_email` (String) Service-Account linked to the Key within the STACKIT-KMS.

‎examples/data-sources/stackit_objectstorage_compliance_lock/data-source.tf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
data "stackit_objectstorage_compliance_lock" "example" {
2+
project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
3+
}

‎examples/resources/stackit_objectstorage_compliance_lock/resource.tf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
resource "stackit_objectstorage_compliance_lock" "example" {
2+
project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
3+
}

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.27.1
2626
github.com/stackitcloud/stackit-sdk-go/services/modelserving v0.8.1
2727
github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.7.1
28-
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.6.1
28+
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.7.0
2929
github.com/stackitcloud/stackit-sdk-go/services/observability v0.17.0
3030
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.26.1
3131
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.3.5

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ github.com/stackitcloud/stackit-sdk-go/services/modelserving v0.8.1 h1:qBPfWK6Xp
181181
github.com/stackitcloud/stackit-sdk-go/services/modelserving v0.8.1/go.mod h1:b8L6f68HZce01y+eZ1o7KTRAkgpWhggpvakAEwnxnCs=
182182
github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.7.1 h1:8HFqfUI35Uk5QHUr3+VO21KXstzUl5zDKFrMuVOx+BI=
183183
github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.7.1/go.mod h1:an5vc+0PL6OBMqFl75uuQpVGyzWHBpoxc9a5p41fFA8=
184-
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.6.1 h1:rOf829+57quGO2x3aG4dJJFgx4ZdtWqYE+hkW1tqGSY=
185-
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.6.1/go.mod h1:RFL4h6JZvpsyFYbdJ3+eINEkletzJQTfrPdd+yPT/fU=
184+
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.7.0 h1:UxnbsKm6PQV8Gudw/EhySaEh9q1xSaTG8mzJz1EvhnE=
185+
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.7.0/go.mod h1:RFL4h6JZvpsyFYbdJ3+eINEkletzJQTfrPdd+yPT/fU=
186186
github.com/stackitcloud/stackit-sdk-go/services/observability v0.17.0 h1:LGwCvvST0fwUgZ6bOxYIfu45qqTgv421ZS07UhKjZL8=
187187
github.com/stackitcloud/stackit-sdk-go/services/observability v0.17.0/go.mod h1:9KdrXC5JS30Ay3mR0adb3vNdhca+qxiy/cPF5P4wehQ=
188188
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.26.1 h1:AO5Np67/w0AUdhb6yk+CTXMzMkGdQPudmI8ryWp94fQ=

0 commit comments

Comments
 (0)