Skip to content

Commit

Permalink
chore: fix lint issues with deprecated google cloud asset dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
chdorner-snyk committed Oct 16, 2023
1 parent 3990f6a commit 1778af4
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion enumeration/remote/google/repository/asset.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"fmt"

asset "cloud.google.com/go/asset/apiv1"
assetpb "cloud.google.com/go/asset/apiv1/assetpb"
"github.com/snyk/driftctl/enumeration/remote/cache"
"github.com/snyk/driftctl/enumeration/remote/google/config"
"google.golang.org/api/iterator"
assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
)

// https://cloud.google.com/asset-inventory/docs/supported-asset-types#supported_resource_types
Expand Down
2 changes: 1 addition & 1 deletion enumeration/remote/google/repository/asset_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package repository
import (
"testing"

assetpb "cloud.google.com/go/asset/apiv1/assetpb"
"github.com/snyk/driftctl/enumeration/remote/cache"
"github.com/snyk/driftctl/enumeration/remote/google/config"
"github.com/snyk/driftctl/test/google"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
)

func Test_assetRepository_searchAllResources_CacheHit(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion enumeration/remote/google_bigquery_scanner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import (

testgoogle "github.com/snyk/driftctl/test/google"

assetpb "cloud.google.com/go/asset/apiv1/assetpb"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
Expand Down
2 changes: 1 addition & 1 deletion enumeration/remote/google_bigtable_scanner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import (

testgoogle "github.com/snyk/driftctl/test/google"

assetpb "cloud.google.com/go/asset/apiv1/assetpb"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/types/known/structpb"
Expand Down
2 changes: 1 addition & 1 deletion enumeration/remote/google_cloudfunctions_scanner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import (

testgoogle "github.com/snyk/driftctl/test/google"

assetpb "cloud.google.com/go/asset/apiv1/assetpb"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/types/known/structpb"
Expand Down
2 changes: 1 addition & 1 deletion enumeration/remote/google_cloudrun_scanner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import (

testgoogle "github.com/snyk/driftctl/test/google"

assetpb "cloud.google.com/go/asset/apiv1/assetpb"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
Expand Down
2 changes: 1 addition & 1 deletion enumeration/remote/google_compute_scanner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ import (
googleresource "github.com/snyk/driftctl/enumeration/resource/google"
"github.com/snyk/driftctl/mocks"

assetpb "cloud.google.com/go/asset/apiv1/assetpb"
"github.com/snyk/driftctl/test/goldenfile"
testgoogle "github.com/snyk/driftctl/test/google"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/types/known/structpb"
Expand Down
2 changes: 1 addition & 1 deletion enumeration/remote/google_network_scanner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import (

testgoogle "github.com/snyk/driftctl/test/google"

assetpb "cloud.google.com/go/asset/apiv1/assetpb"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
Expand Down
2 changes: 1 addition & 1 deletion enumeration/remote/google_sql_scanner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import (

testgoogle "github.com/snyk/driftctl/test/google"

assetpb "cloud.google.com/go/asset/apiv1/assetpb"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/types/known/structpb"
Expand Down
2 changes: 1 addition & 1 deletion enumeration/remote/google_storage_scanner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import (
"github.com/snyk/driftctl/enumeration/resource"
"github.com/snyk/driftctl/mocks"

assetpb "cloud.google.com/go/asset/apiv1/assetpb"
"github.com/snyk/driftctl/test/goldenfile"
testgoogle "github.com/snyk/driftctl/test/google"
terraform2 "github.com/snyk/driftctl/test/terraform"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
Expand Down
2 changes: 1 addition & 1 deletion test/google/asset.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"net"

asset "cloud.google.com/go/asset/apiv1"
assetpb "cloud.google.com/go/asset/apiv1/assetpb"
"google.golang.org/api/option"
assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
)
Expand Down

0 comments on commit 1778af4

Please sign in to comment.