Skip to content

Commit

Permalink
Use pre-release bridge for more instrumentation (#3047)
Browse files Browse the repository at this point in the history 
Changes in the bridge dependency:
pulumi/pulumi-terraform-bridge@v3.66.0...2f132e7

This change should enable more logs being captured through TF_LOG=trace
troubleshooting, and add additional spans in --tracing shedding light on
where the time is being spent around Configure and CheckConfig.
  • Loading branch information
@t0yv0
t0yv0 committed Nov 27, 2023
1 parent a1ec31f commit c130444
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 12 deletions.
4 changes: 2 additions & 2 deletions examples/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.21.0
require (
github.com/aws/aws-sdk-go v1.47.12
github.com/pulumi/pulumi-aws/provider/v6 v6.0.0-00010101000000-000000000000
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.0
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.1-0.20231127160738-2f132e750bb5
github.com/pulumi/pulumi-terraform-bridge/testing v0.0.2-0.20230927165309-e3fd9503f2d3
github.com/pulumi/pulumi/pkg/v3 v3.94.2
github.com/stretchr/testify v1.8.4
Expand Down Expand Up @@ -268,7 +268,7 @@ require (
github.com/pkg/term v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pulumi/esc v0.6.0 // indirect
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.0 // indirect
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.1-0.20231127160738-2f132e750bb5 // indirect
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20230801203955-5d215c892096 // indirect
github.com/pulumi/pulumi/sdk/v3 v3.94.2 // indirect
github.com/pulumi/terraform-diff-reader v0.0.2 // indirect
Expand Down
8 changes: 4 additions & 4 deletions examples/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2358,12 +2358,12 @@ github.com/pulumi/esc v0.6.0 h1:m8jWgBektlj26RvrN3/sM0r1lYiwTMmqVPvLxCxahGE=
github.com/pulumi/esc v0.6.0/go.mod h1:Y6W21yUukvxS2NnS5ae1beMSPhMvj0xNAYcDqDHVj/g=
github.com/pulumi/providertest v0.0.3 h1:DLcAvVGgeP4mHEi1Ftk5zTX9QHjcrO6u5w5GCZrF99s=
github.com/pulumi/providertest v0.0.3/go.mod h1:kZYBA14iemv3X4G4xsBKaa72zVbn//IyL5HTYKpLuy0=
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.0 h1:SdZn+lpoW5MvQp5Ogj2KRZvib9M1xjOoRpEEXD4DWrA=
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.0/go.mod h1:ogKh6ynS1wuGGY6ebopoglwHIwRZNGAyWKuz1A3yGs4=
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.1-0.20231127160738-2f132e750bb5 h1:c9GgvZd6qKwE4Tc9NNM3mMYju/XBcVMyFxXVeEUT1KA=
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.1-0.20231127160738-2f132e750bb5/go.mod h1:dSuK3rjDQoLpB3hwo+nsbSz1/zLmoygNDAEjQWgo+Qw=
github.com/pulumi/pulumi-terraform-bridge/testing v0.0.2-0.20230927165309-e3fd9503f2d3 h1:bBWWeAtSPPYpKYlPZr2h0BiYgWQpHRIk0HO/MQmB+jc=
github.com/pulumi/pulumi-terraform-bridge/testing v0.0.2-0.20230927165309-e3fd9503f2d3/go.mod h1:vAQ7DeddebQ7FHdRaSG6ijuS28FS9PC4j8Y9wUuue0c=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.0 h1:1U5n9Xzh+BPf4/5x7EvaopwtsTvpP/RZ8FVUTE5IN5I=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.0/go.mod h1:1ZnUBM2KMg/JHgFn5tN/OrwRmgdJIGQ1uWs758CmdGY=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.1-0.20231127160738-2f132e750bb5 h1:yfRy8v1faXi3uugjdPD8NC99a2f6wdu64hOqf8K6vBE=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.1-0.20231127160738-2f132e750bb5/go.mod h1:7hO7EEHqGhQZIv6IXpyIIsuvk1EvZ/8MCenGX61KNTY=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20230801203955-5d215c892096 h1:1nzT9XuyTHdcWJboYNMPPdW0B0mQdXYg8Az5tF96MXY=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20230801203955-5d215c892096/go.mod h1:1pLAP9kryYta3Xrw99oh7BmxY6PYb+z2m7ENNCJMIRQ=
github.com/pulumi/pulumi/pkg/v3 v3.94.2 h1:b+gQ+EJZMYfSIu/sb/+p36VmfZ2ZJWbEWMsptt2f6Kk=
Expand Down
4 changes: 2 additions & 2 deletions provider/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ require (
github.com/hashicorp/terraform-provider-aws v1.60.1-0.20220923175450-ca71523cdc36
github.com/mitchellh/go-homedir v1.1.0
github.com/pulumi/providertest v0.0.3
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.0
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.0
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.1-0.20231127160738-2f132e750bb5
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.1-0.20231127160738-2f132e750bb5
github.com/pulumi/pulumi/pkg/v3 v3.94.2
github.com/pulumi/pulumi/sdk/v3 v3.94.2
github.com/stretchr/testify v1.8.4
Expand Down
8 changes: 4 additions & 4 deletions provider/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2380,12 +2380,12 @@ github.com/pulumi/providertest v0.0.3 h1:DLcAvVGgeP4mHEi1Ftk5zTX9QHjcrO6u5w5GCZr
github.com/pulumi/providertest v0.0.3/go.mod h1:kZYBA14iemv3X4G4xsBKaa72zVbn//IyL5HTYKpLuy0=
github.com/pulumi/pulumi-java/pkg v0.9.8 h1:c8mYsalnRXA2Ibgvv6scefOn6mW1Vb0UT0mcDqjsivQ=
github.com/pulumi/pulumi-java/pkg v0.9.8/go.mod h1:c6rSw/+q4O0IImgJ9axxoC6QesbPYWBaG5gimbHouUQ=
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.0 h1:SdZn+lpoW5MvQp5Ogj2KRZvib9M1xjOoRpEEXD4DWrA=
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.0/go.mod h1:ogKh6ynS1wuGGY6ebopoglwHIwRZNGAyWKuz1A3yGs4=
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.1-0.20231127160738-2f132e750bb5 h1:c9GgvZd6qKwE4Tc9NNM3mMYju/XBcVMyFxXVeEUT1KA=
github.com/pulumi/pulumi-terraform-bridge/pf v0.20.1-0.20231127160738-2f132e750bb5/go.mod h1:dSuK3rjDQoLpB3hwo+nsbSz1/zLmoygNDAEjQWgo+Qw=
github.com/pulumi/pulumi-terraform-bridge/testing v0.0.1 h1:SCg1gjfY9N4yn8U8peIUYATifjoDABkyR7H9lmefsfc=
github.com/pulumi/pulumi-terraform-bridge/testing v0.0.1/go.mod h1:7OeUPH8rpt5ipyj9EFcnXpuzQ8SHL0dyqdfa8nOacdk=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.0 h1:1U5n9Xzh+BPf4/5x7EvaopwtsTvpP/RZ8FVUTE5IN5I=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.0/go.mod h1:1ZnUBM2KMg/JHgFn5tN/OrwRmgdJIGQ1uWs758CmdGY=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.1-0.20231127160738-2f132e750bb5 h1:yfRy8v1faXi3uugjdPD8NC99a2f6wdu64hOqf8K6vBE=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.1-0.20231127160738-2f132e750bb5/go.mod h1:7hO7EEHqGhQZIv6IXpyIIsuvk1EvZ/8MCenGX61KNTY=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20230801203955-5d215c892096 h1:1nzT9XuyTHdcWJboYNMPPdW0B0mQdXYg8Az5tF96MXY=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20230801203955-5d215c892096/go.mod h1:1pLAP9kryYta3Xrw99oh7BmxY6PYb+z2m7ENNCJMIRQ=
github.com/pulumi/pulumi-yaml v1.4.2 h1:LKptNH2lG6f5IjJmR7bvu7ouBE4sgkTRNd4I8ZHmjHw=
Expand Down
10 changes: 10 additions & 0 deletions provider/resources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"context"
_ "embed"
"fmt"
"log"
"os"
"path/filepath"
"strconv"
Expand Down Expand Up @@ -633,12 +634,21 @@ func preConfigureCallback(vars resource.PropertyMap, c shim.ResourceConfig) erro
// if we skipCredentialsValidation then we don't need to do anything in
// preConfigureCallback as this is an explicit operation
if skipCredentialsValidation {
log.Printf("[INFO] pulumi-aws: skip credentials validation")
return nil
}

var err error
if credentialsValidationRun.CompareAndSwap(false, true) {
log.Printf("[INFO] pulumi-aws: starting to validate credentials. " +
"Disable this by AWS_SKIP_CREDENTIALS_VALIDATION or " +
"skipCredentialsValidation option")
err = validateCredentials(vars, c)
if err == nil {
log.Printf("[INFO] pulumi-aws: credentials are valid")
} else {
log.Printf("[INFO] pulumi-aws: error validating credentials: %v", err)
}
}
return err
}
Expand Down

0 comments on commit c130444

Please sign in to comment.