Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/github.com/hashicorp/t…
Browse files Browse the repository at this point in the history
…erraform-plugin-framework-1.3.5
  • Loading branch information
bendbennett authored Aug 18, 2023
2 parents df98957 + 31d2db4 commit 754a238
Show file tree
Hide file tree
Showing 14 changed files with 64 additions and 70 deletions.
26 changes: 12 additions & 14 deletions docs/cdktf/python/data-sources/certificate.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ Use this data source to get information, such as SHA1 fingerprint or serial numb

### URL Usage
```python
# Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
from constructs import Construct
from cdktf import property_access, Token, TerraformStack
from cdktf import Fn, Token, TerraformStack
#
# Provider bindings are generated by running `cdktf get`.
# See https://cdk.tf/provider-generation for more details.
Expand All @@ -29,36 +29,34 @@ from imports.aws.eks_cluster import EksCluster
from imports.aws.iam_openid_connect_provider import IamOpenidConnectProvider
from imports.tls.data_tls_certificate import DataTlsCertificate
class MyConvertedCode(TerraformStack):
def __init__(self, scope, name, *, roleArn, vpcConfig):
def __init__(self, scope, name):
super().__init__(scope, name)
# The following providers are missing schema information and might need manual adjustments to synthesize correctly: aws.
# For a more precise conversion please use the --provider flag in convert.
example = EksCluster(self, "example",
name="example",
role_arn=role_arn,
vpc_config=vpc_config
name="example"
)
data_tls_certificate_example = DataTlsCertificate(self, "example_1",
url=Token.as_string(
property_access(example.identity, ["0", "oidc", "0", "issuer"]))
Fn.lookup_nested(example.identity, ["0", "oidc", "0", "issuer"]))
)
# This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.
data_tls_certificate_example.override_logical_id("example")
aws_iam_openid_connect_provider_example = IamOpenidConnectProvider(self, "example_2",
client_id_list=["sts.amazonaws.com"],
thumbprint_list=[
Token.as_string(
property_access(data_tls_certificate_example.certificates, ["0", "sha1_fingerprint"
]))
Fn.lookup_nested(data_tls_certificate_example.certificates, ["0", "sha1_fingerprint"
])
],
url=Token.as_string(
property_access(example.identity, ["0", "oidc", "0", "issuer"]))
url=Fn.lookup_nested(example.identity, ["0", "oidc", "0", "issuer"])
)
# This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.
aws_iam_openid_connect_provider_example.override_logical_id("example")
```

### Content Usage
```python
# Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
from constructs import Construct
from cdktf import Fn, Token, TerraformStack
#
Expand Down Expand Up @@ -111,4 +109,4 @@ Read-Only:
- `version` (Number) The version the certificate is in.
- `cert_pem` (String) Certificate data in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. **NOTE**: the [underlying](https://pkg.go.dev/encoding/pem#Encode) [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at the end of the PEM. In case this disrupts your use case, we recommend using [`trimspace()`](https://www.terraform.io/language/functions/trimspace).

<!-- cache-key: cdktf-0.17.1 input-aa0448a429be224544a948790292f3b630d2ecf0739247bd90334feadefa8419 -->
<!-- cache-key: cdktf-0.18.0 input-aa0448a429be224544a948790292f3b630d2ecf0739247bd90334feadefa8419 -->
4 changes: 2 additions & 2 deletions docs/cdktf/python/data-sources/public_key.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Use this data source to get the public key from a [PEM (RFC 1421)](https://datat
## Example Usage

```python
# Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
from constructs import Construct
from cdktf import Fn, Token, TerraformStack
#
Expand Down Expand Up @@ -58,4 +58,4 @@ class MyConvertedCode(TerraformStack):
- `public_key_openssh` (String) The public key, in [OpenSSH PEM (RFC 4716)](https://datatracker.ietf.org/doc/html/rfc4716) format. This is also known as ['Authorized Keys'](https://www.ssh.com/academy/ssh/authorized_keys/openssh#format-of-the-authorized-keys-file) format. This is not populated for `ECDSA` with curve `P224`, as it is [not supported](../../docs#limitations). **NOTE**: the [underlying](https://pkg.go.dev/encoding/pem#Encode) [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at the end of the PEM. In case this disrupts your use case, we recommend using [`trimspace()`](https://www.terraform.io/language/functions/trimspace).
- `public_key_pem` (String) The public key, in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. **NOTE**: the [underlying](https://pkg.go.dev/encoding/pem#Encode) [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at the end of the PEM. In case this disrupts your use case, we recommend using [`trimspace()`](https://www.terraform.io/language/functions/trimspace).

<!-- cache-key: cdktf-0.17.1 input-025d5bde39901a91ba6cb60272c97a78a0c01a6de59d77d7dea035490ff6ee0a -->
<!-- cache-key: cdktf-0.18.0 input-025d5bde39901a91ba6cb60272c97a78a0c01a6de59d77d7dea035490ff6ee0a -->
14 changes: 8 additions & 6 deletions docs/cdktf/python/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ Use the navigation to the left to read about the available resources.
## Example Usage

```python
# Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
from constructs import Construct
from cdktf import Token, TerraformStack
from cdktf import TerraformStack
#
# Provider bindings are generated by running `cdktf get`.
# See https://cdk.tf/provider-generation for more details.
Expand All @@ -40,6 +40,8 @@ from imports.tls.self_signed_cert import SelfSignedCert
class MyConvertedCode(TerraformStack):
def __init__(self, scope, name):
super().__init__(scope, name)
# The following providers are missing schema information and might need manual adjustments to synthesize correctly: aws.
# For a more precise conversion please use the --provider flag in convert.
example = PrivateKey(self, "example",
algorithm="ECDSA"
)
Expand All @@ -58,7 +60,7 @@ class MyConvertedCode(TerraformStack):
# This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.
tls_self_signed_cert_example.override_logical_id("example")
aws_iam_server_certificate_example = IamServerCertificate(self, "example_2",
certificate_body=Token.as_string(tls_self_signed_cert_example.cert_pem),
certificate_body=tls_self_signed_cert_example.cert_pem,
name="example_self_signed_cert",
private_key=example.private_key_pem
)
Expand All @@ -69,7 +71,7 @@ class MyConvertedCode(TerraformStack):
### Configuring Proxy

```python
# Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
from constructs import Construct
from cdktf import TerraformStack
#
Expand All @@ -92,7 +94,7 @@ class MyConvertedCode(TerraformStack):
```

```python
# Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
from constructs import Construct
from cdktf import TerraformStack
#
Expand Down Expand Up @@ -166,4 +168,4 @@ Failing that, **protecting the content of the state file is strongly recommended
The more general advice is that it's better to generate "secrets" outside of Terraform,
and then distribute them securely to the system where Terraform will make use of them.

<!-- cache-key: cdktf-0.17.1 input-9629aac943b54f5dd10ea0b4a5ac545ba133cdf7ce49405f60bebc3525e333fa -->
<!-- cache-key: cdktf-0.18.0 input-9629aac943b54f5dd10ea0b4a5ac545ba133cdf7ce49405f60bebc3525e333fa -->
4 changes: 2 additions & 2 deletions docs/cdktf/python/resources/cert_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ state and does not create any external managed resources.
## Example Usage

```python
# Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
from constructs import Construct
from cdktf import Fn, Token, TerraformStack
#
Expand Down Expand Up @@ -79,4 +79,4 @@ Optional:
- `serial_number` (String) Distinguished name: `SERIALNUMBER`
- `street_address` (List of String) Distinguished name: `STREET`

<!-- cache-key: cdktf-0.17.1 input-f0b329ca4c0554d420316e3aa077babdcc26589666ed69b639e7ed93d15ac558 -->
<!-- cache-key: cdktf-0.18.0 input-f0b329ca4c0554d420316e3aa077babdcc26589666ed69b639e7ed93d15ac558 -->
4 changes: 2 additions & 2 deletions docs/cdktf/python/resources/locally_signed_cert.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ or when deployed internally to an organization.
## Example Usage

```python
# Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
from constructs import Construct
from cdktf import Fn, Token, TerraformStack
#
Expand Down Expand Up @@ -80,4 +80,4 @@ a new certificate when the current one is about to expire.
The creation of a new certificate may of course cause dependent resources to be updated
or replaced, depending on the lifecycle rules applying to those resources.

<!-- cache-key: cdktf-0.17.1 input-68f5a3ac6e15730702eda898fd0b26d83e0623e2680b4782c44d4d8fba2cfe8f -->
<!-- cache-key: cdktf-0.18.0 input-68f5a3ac6e15730702eda898fd0b26d83e0623e2680b4782c44d4d8fba2cfe8f -->
4 changes: 2 additions & 2 deletions docs/cdktf/python/resources/private_key.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ state and does not create any external managed resources.
## Example Usage

```python
# Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
from constructs import Construct
from cdktf import TerraformStack
#
Expand Down Expand Up @@ -88,4 +88,4 @@ terraform taint tls_private_key.example

A new key will then be generated on the next `terraform apply`.

<!-- cache-key: cdktf-0.17.1 input-d883372f4f6fca4ca740c03d31a34cdd6a12ec7204e44e20824b895a27ded4a4 -->
<!-- cache-key: cdktf-0.18.0 input-d883372f4f6fca4ca740c03d31a34cdd6a12ec7204e44e20824b895a27ded4a4 -->
4 changes: 2 additions & 2 deletions docs/cdktf/python/resources/self_signed_cert.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ connecting to a server that has a self-signed certificate.
## Example Usage

```python
# Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
from constructs import Construct
from cdktf import Fn, Token, TerraformStack
#
Expand Down Expand Up @@ -102,4 +102,4 @@ a new certificate when the current one is about to expire.
The creation of a new certificate may of course cause dependent resources to be updated
or replaced, depending on the lifecycle rules applying to those resources.

<!-- cache-key: cdktf-0.17.1 input-fdcdd1b995d8aef8a660e00b2010a6a6f9c7bd0b3ef6d96ee4709050cd0a2354 -->
<!-- cache-key: cdktf-0.18.0 input-fdcdd1b995d8aef8a660e00b2010a6a6f9c7bd0b3ef6d96ee4709050cd0a2354 -->
38 changes: 15 additions & 23 deletions docs/cdktf/typescript/data-sources/certificate.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,30 @@ Use this data source to get information, such as SHA1 fingerprint or serial numb

### URL Usage
```typescript
// Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
import { Construct } from "constructs";
import { propertyAccess, Token, TerraformStack } from "cdktf";
import { Fn, Token, TerraformStack } from "cdktf";
/*
* Provider bindings are generated by running `cdktf get`.
* See https://cdk.tf/provider-generation for more details.
*/
import { EksCluster } from "./.gen/providers/aws/eks-cluster";
import { IamOpenidConnectProvider } from "./.gen/providers/aws/iam-openid-connect-provider";
import { DataTlsCertificate } from "./.gen/providers/tls/data-tls-certificate";
interface MyConfig {
roleArn: any;
vpcConfig: any;
}
class MyConvertedCode extends TerraformStack {
constructor(scope: Construct, name: string, config: MyConfig) {
constructor(scope: Construct, name: string) {
super(scope, name);
/*The following providers are missing schema information and might need manual adjustments to synthesize correctly: aws.
For a more precise conversion please use the --provider flag in convert.*/
const example = new EksCluster(this, "example", {
name: "example",
roleArn: config.roleArn,
vpcConfig: config.vpcConfig,
});
const dataTlsCertificateExample = new DataTlsCertificate(
this,
"example_1",
{
url: Token.asString(
propertyAccess(example.identity, ["0", "oidc", "0", "issuer"])
Fn.lookupNested(example.identity, ["0", "oidc", "0", "issuer"])
),
}
);
Expand All @@ -55,18 +51,14 @@ class MyConvertedCode extends TerraformStack {
this,
"example_2",
{
clientIdList: ["sts.amazonaws.com"],
thumbprintList: [
Token.asString(
propertyAccess(dataTlsCertificateExample.certificates, [
"0",
"sha1_fingerprint",
])
),
client_id_list: ["sts.amazonaws.com"],
thumbprint_list: [
Fn.lookupNested(dataTlsCertificateExample.certificates, [
"0",
"sha1_fingerprint",
]),
],
url: Token.asString(
propertyAccess(example.identity, ["0", "oidc", "0", "issuer"])
),
url: Fn.lookupNested(example.identity, ["0", "oidc", "0", "issuer"]),
}
);
/*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/
Expand All @@ -78,7 +70,7 @@ class MyConvertedCode extends TerraformStack {

### Content Usage
```typescript
// Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
import { Construct } from "constructs";
import { Fn, Token, TerraformStack } from "cdktf";
/*
Expand Down Expand Up @@ -134,4 +126,4 @@ Read-Only:
- `version` (Number) The version the certificate is in.
- `certPem` (String) Certificate data in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. **NOTE**: the [underlying](https://pkg.go.dev/encoding/pem#Encode) [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at the end of the PEM. In case this disrupts your use case, we recommend using [`trimspace()`](https://www.terraform.io/language/functions/trimspace).

<!-- cache-key: cdktf-0.17.1 input-aa0448a429be224544a948790292f3b630d2ecf0739247bd90334feadefa8419 -->
<!-- cache-key: cdktf-0.18.0 input-aa0448a429be224544a948790292f3b630d2ecf0739247bd90334feadefa8419 -->
4 changes: 2 additions & 2 deletions docs/cdktf/typescript/data-sources/public_key.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Use this data source to get the public key from a [PEM (RFC 1421)](https://datat
## Example Usage

```typescript
// Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
import { Construct } from "constructs";
import { Fn, Token, TerraformStack } from "cdktf";
/*
Expand Down Expand Up @@ -61,4 +61,4 @@ class MyConvertedCode extends TerraformStack {
- `publicKeyOpenssh` (String) The public key, in [OpenSSH PEM (RFC 4716)](https://datatracker.ietf.org/doc/html/rfc4716) format. This is also known as ['Authorized Keys'](https://www.ssh.com/academy/ssh/authorized_keys/openssh#format-of-the-authorized-keys-file) format. This is not populated for `ecdsa` with curve `p224`, as it is [not supported](../../docs#limitations). **NOTE**: the [underlying](https://pkg.go.dev/encoding/pem#Encode) [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at the end of the PEM. In case this disrupts your use case, we recommend using [`trimspace()`](https://www.terraform.io/language/functions/trimspace).
- `publicKeyPem` (String) The public key, in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. **NOTE**: the [underlying](https://pkg.go.dev/encoding/pem#Encode) [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at the end of the PEM. In case this disrupts your use case, we recommend using [`trimspace()`](https://www.terraform.io/language/functions/trimspace).

<!-- cache-key: cdktf-0.17.1 input-025d5bde39901a91ba6cb60272c97a78a0c01a6de59d77d7dea035490ff6ee0a -->
<!-- cache-key: cdktf-0.18.0 input-025d5bde39901a91ba6cb60272c97a78a0c01a6de59d77d7dea035490ff6ee0a -->
16 changes: 9 additions & 7 deletions docs/cdktf/typescript/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ Use the navigation to the left to read about the available resources.
## Example Usage

```typescript
// Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
import { Construct } from "constructs";
import { Token, TerraformStack } from "cdktf";
import { TerraformStack } from "cdktf";
/*
* Provider bindings are generated by running `cdktf get`.
* See https://cdk.tf/provider-generation for more details.
Expand All @@ -40,6 +40,8 @@ import { SelfSignedCert } from "./.gen/providers/tls/self-signed-cert";
class MyConvertedCode extends TerraformStack {
constructor(scope: Construct, name: string) {
super(scope, name);
/*The following providers are missing schema information and might need manual adjustments to synthesize correctly: aws.
For a more precise conversion please use the --provider flag in convert.*/
const example = new PrivateKey(this, "example", {
algorithm: "ECDSA",
});
Expand All @@ -61,9 +63,9 @@ class MyConvertedCode extends TerraformStack {
this,
"example_2",
{
certificateBody: Token.asString(tlsSelfSignedCertExample.certPem),
certificate_body: tlsSelfSignedCertExample.certPem,
name: "example_self_signed_cert",
privateKey: example.privateKeyPem,
private_key: example.privateKeyPem,
}
);
/*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/
Expand All @@ -76,7 +78,7 @@ class MyConvertedCode extends TerraformStack {
### Configuring Proxy

```typescript
// Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
import { Construct } from "constructs";
import { TerraformStack } from "cdktf";
/*
Expand All @@ -102,7 +104,7 @@ class MyConvertedCode extends TerraformStack {
```

```typescript
// Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug
import { Construct } from "constructs";
import { TerraformStack } from "cdktf";
/*
Expand Down Expand Up @@ -179,4 +181,4 @@ Failing that, **protecting the content of the state file is strongly recommended
The more general advice is that it's better to generate "secrets" outside of Terraform,
and then distribute them securely to the system where Terraform will make use of them.

<!-- cache-key: cdktf-0.17.1 input-9629aac943b54f5dd10ea0b4a5ac545ba133cdf7ce49405f60bebc3525e333fa -->
<!-- cache-key: cdktf-0.18.0 input-9629aac943b54f5dd10ea0b4a5ac545ba133cdf7ce49405f60bebc3525e333fa -->
Loading

0 comments on commit 754a238

Please sign in to comment.