upgrade to tfbridge v3.42.1 & fix lint (#525)

* update pulumi-terraform-bridge to v3.42.1 for docs generation pulumi/docs#8672 * fixes use of deprecated pattern matching method for #526 (comment)
pulumi · Mar 8, 2023 · 86b7486 · 86b7486
1 parent d4c24c6
commit 86b7486
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/provider/go.mod b/provider/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/moby/moby v23.0.0+incompatible
 	github.com/moby/patternmatcher v0.5.0
 	github.com/pkg/errors v0.9.1
-	github.com/pulumi/pulumi-terraform-bridge/v3 v3.42.1-0.20230308062139-d8c5f91bf8c5
+	github.com/pulumi/pulumi-terraform-bridge/v3 v3.42.1
 	github.com/pulumi/pulumi/pkg/v3 v3.56.0
 	github.com/pulumi/pulumi/sdk/v3 v3.56.0
 	github.com/stretchr/testify v1.8.2

diff --git a/provider/go.sum b/provider/go.sum
@@ -1918,8 +1918,8 @@ github.com/prometheus/prometheus v0.40.5/go.mod h1:bxgdmtoSNLmmIVPGmeTJ3OiP67Vmu
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/pulumi/pulumi-java/pkg v0.8.0 h1:b81/D/dk5/9OEH1k5BJxhqYiQc7Y4TPDbHVGBvJU1GE=
 github.com/pulumi/pulumi-java/pkg v0.8.0/go.mod h1:x7/J1GCJ+hHFBEgnMr4QpsTfjXUNHccAHJ9gvFfmAFU=
-github.com/pulumi/pulumi-terraform-bridge/v3 v3.42.1-0.20230308062139-d8c5f91bf8c5 h1:Mu0evKDmZG7voNnrOu1dJN406mtwYR+EE7W8LuetQWY=
-github.com/pulumi/pulumi-terraform-bridge/v3 v3.42.1-0.20230308062139-d8c5f91bf8c5/go.mod h1:ej3U842Dtjk6kIQv2b3dtHKqFyggbZqlDoPWzc2EZvM=
+github.com/pulumi/pulumi-terraform-bridge/v3 v3.42.1 h1:W3RJShHlsvVmTRuftLdp1yLQpRqU0c66iQMpxVqXVOs=
+github.com/pulumi/pulumi-terraform-bridge/v3 v3.42.1/go.mod h1:ej3U842Dtjk6kIQv2b3dtHKqFyggbZqlDoPWzc2EZvM=
 github.com/pulumi/pulumi-yaml v1.0.4 h1:p+989rW3AqkkxbzxtxccHKAN4xCJi3K2cRpvA2K84tw=
 github.com/pulumi/pulumi-yaml v1.0.4/go.mod h1:Szj8ud4Vqyq3oO1n3kzIUfaP3AiCjYZM4FYjOVWwJn8=
 github.com/pulumi/pulumi/pkg/v3 v3.56.0 h1:GAqRHERowIXCTUM2PX2t0G/UKze06WVhv52S8eO2lE8=

diff --git a/provider/provider.go b/provider/provider.go
@@ -6,6 +6,13 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 	"fmt"
+	"io"
+	"io/fs"
+	"os"
+	"path/filepath"
+	"runtime"
+	"strings"
+
 	pbempty "github.com/golang/protobuf/ptypes/empty"
 	"github.com/moby/buildkit/frontend/dockerfile/dockerignore"
 	"github.com/moby/patternmatcher"
@@ -18,12 +25,6 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/emptypb"
-	"io"
-	"io/fs"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
 )
 
 type dockerNativeProvider struct {
@@ -511,7 +512,7 @@ func hashContext(dockerContextPath string, dockerfile string) (string, error) {
 		if path == "." {
 			return nil
 		}
-		ignore, err := ignoreMatcher.Matches(path)
+		ignore, err := ignoreMatcher.MatchesOrParentMatches(path)
 		if err != nil {
 			return fmt.Errorf("%s rule failed: %w", dockerIgnorePath, err)
 		}