internal: various vet.sh fixes, migrate to 1.13
- Migrate vet.sh to using 1.13.
- Includes `goimports -w .`.
- Perform go mod download on 1.13 (though, not sure if that's really necessary anymore... ah well, to explore another day).
- Replaces the git ls-files | xargs grep call with find -exec grep. This is because grep fails with exit code 1 if it doesn't match anything (ex if ALL files have copyrights - which is good!), and xargs will fail with 123 if its command (grep) fails with any 1-125 exit code. See an example 123 when in fact all files have copyrights here: https://sponge.corp.google.com/target?id=36e75fa8-5c1e-46c2-b2d8-516b9990d0c4&target=cloud-go-libraries%2Fgoogle-cloud-go%2Fpresubmit%2Fgo113&searchFor=.
- Switches staticcheck to a grep based exclusion instead of -ignore, which was removed.
- Removes set -x pipefail, because... why would we want a midpipe
failured to fail the whole thing?
Change-Id: I919f4388189b8584189eb76fda5107dc4709a9cd
Reviewed-on: https://code-review.googlesource.com/c/gocloud/+/45350
Reviewed-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Emmanuel Odeke <emm.odeke@gmail.com>
diff --git a/asset/apiv1/mock_test.go b/asset/apiv1/mock_test.go
index f44b28d..61ae4b9 100644
--- a/asset/apiv1/mock_test.go
+++ b/asset/apiv1/mock_test.go
@@ -17,11 +17,6 @@
package asset
import (
- assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -35,10 +30,14 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"google.golang.org/api/option"
+ assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
+ longrunningpb "google.golang.org/genproto/googleapis/longrunning"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/asset/apiv1beta1/mock_test.go b/asset/apiv1beta1/mock_test.go
index 417b8d6..4e3d479 100644
--- a/asset/apiv1beta1/mock_test.go
+++ b/asset/apiv1beta1/mock_test.go
@@ -17,11 +17,6 @@
package asset
import (
- assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1beta1"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -35,10 +30,14 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"google.golang.org/api/option"
+ assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1beta1"
+ longrunningpb "google.golang.org/genproto/googleapis/longrunning"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/asset/apiv1p2beta1/mock_test.go b/asset/apiv1p2beta1/mock_test.go
index f4945dd..cdfbca0 100644
--- a/asset/apiv1p2beta1/mock_test.go
+++ b/asset/apiv1p2beta1/mock_test.go
@@ -17,13 +17,6 @@
package asset
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1p2beta1"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
- field_maskpb "google.golang.org/genproto/protobuf/field_mask"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -36,11 +29,17 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1p2beta1"
+ longrunningpb "google.golang.org/genproto/googleapis/longrunning"
+ field_maskpb "google.golang.org/genproto/protobuf/field_mask"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/automl/apiv1beta1/mock_test.go b/automl/apiv1beta1/mock_test.go
index fc5ea27..43b12f0 100644
--- a/automl/apiv1beta1/mock_test.go
+++ b/automl/apiv1beta1/mock_test.go
@@ -17,12 +17,6 @@
package automl
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -35,11 +29,16 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1beta1"
+ longrunningpb "google.golang.org/genproto/googleapis/longrunning"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/bigquery/datatransfer/apiv1/ListDataSources_smoke_test.go b/bigquery/datatransfer/apiv1/ListDataSources_smoke_test.go
index a004852..4b8c4a6 100644
--- a/bigquery/datatransfer/apiv1/ListDataSources_smoke_test.go
+++ b/bigquery/datatransfer/apiv1/ListDataSources_smoke_test.go
@@ -17,10 +17,6 @@
package datatransfer
import (
- datatransferpb "google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1"
-)
-
-import (
"context"
"fmt"
"strconv"
@@ -30,6 +26,7 @@
"cloud.google.com/go/internal/testutil"
"google.golang.org/api/iterator"
"google.golang.org/api/option"
+ datatransferpb "google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1"
)
var _ = fmt.Sprintf
diff --git a/bigquery/datatransfer/apiv1/mock_test.go b/bigquery/datatransfer/apiv1/mock_test.go
index 63092ce..f68ce12 100644
--- a/bigquery/datatransfer/apiv1/mock_test.go
+++ b/bigquery/datatransfer/apiv1/mock_test.go
@@ -17,13 +17,6 @@
package datatransfer
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- timestamppb "github.com/golang/protobuf/ptypes/timestamp"
- datatransferpb "google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1"
- field_maskpb "google.golang.org/genproto/protobuf/field_mask"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -36,11 +29,17 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
+ timestamppb "github.com/golang/protobuf/ptypes/timestamp"
"google.golang.org/api/option"
+ datatransferpb "google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1"
+ field_maskpb "google.golang.org/genproto/protobuf/field_mask"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/bigquery/storage/apiv1beta1/mock_test.go b/bigquery/storage/apiv1beta1/mock_test.go
index cefa53f..feb6fcc 100644
--- a/bigquery/storage/apiv1beta1/mock_test.go
+++ b/bigquery/storage/apiv1beta1/mock_test.go
@@ -17,11 +17,6 @@
package storage
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- storagepb "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1beta1"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -34,11 +29,15 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ storagepb "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1beta1"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/cloudtasks/apiv2/mock_test.go b/cloudtasks/apiv2/mock_test.go
index c77a989..6a8c5f0 100644
--- a/cloudtasks/apiv2/mock_test.go
+++ b/cloudtasks/apiv2/mock_test.go
@@ -17,12 +17,6 @@
package cloudtasks
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2"
- iampb "google.golang.org/genproto/googleapis/iam/v1"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -35,11 +29,16 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2"
+ iampb "google.golang.org/genproto/googleapis/iam/v1"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/cloudtasks/apiv2beta2/mock_test.go b/cloudtasks/apiv2beta2/mock_test.go
index de7ae71..306468f 100644
--- a/cloudtasks/apiv2beta2/mock_test.go
+++ b/cloudtasks/apiv2beta2/mock_test.go
@@ -17,14 +17,6 @@
package cloudtasks
import (
- durationpb "github.com/golang/protobuf/ptypes/duration"
- emptypb "github.com/golang/protobuf/ptypes/empty"
- timestamppb "github.com/golang/protobuf/ptypes/timestamp"
- taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2beta2"
- iampb "google.golang.org/genproto/googleapis/iam/v1"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -37,11 +29,18 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ durationpb "github.com/golang/protobuf/ptypes/duration"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
+ timestamppb "github.com/golang/protobuf/ptypes/timestamp"
"google.golang.org/api/option"
+ taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2beta2"
+ iampb "google.golang.org/genproto/googleapis/iam/v1"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/cloudtasks/apiv2beta3/mock_test.go b/cloudtasks/apiv2beta3/mock_test.go
index ff90a14..3e1eb86 100644
--- a/cloudtasks/apiv2beta3/mock_test.go
+++ b/cloudtasks/apiv2beta3/mock_test.go
@@ -17,12 +17,6 @@
package cloudtasks
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2beta3"
- iampb "google.golang.org/genproto/googleapis/iam/v1"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -35,11 +29,16 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2beta3"
+ iampb "google.golang.org/genproto/googleapis/iam/v1"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/containeranalysis/apiv1beta1/mock_test.go b/containeranalysis/apiv1beta1/mock_test.go
index a5832a4..b731eef 100644
--- a/containeranalysis/apiv1beta1/mock_test.go
+++ b/containeranalysis/apiv1beta1/mock_test.go
@@ -17,13 +17,6 @@
package containeranalysis
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- containeranalysispb "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1"
- grafeaspb "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/grafeas"
- iampb "google.golang.org/genproto/googleapis/iam/v1"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -36,11 +29,17 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ containeranalysispb "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1"
+ grafeaspb "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/grafeas"
+ iampb "google.golang.org/genproto/googleapis/iam/v1"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/dataproc/apiv1/ListClusters_smoke_test.go b/dataproc/apiv1/ListClusters_smoke_test.go
index cfb0694..7946331 100644
--- a/dataproc/apiv1/ListClusters_smoke_test.go
+++ b/dataproc/apiv1/ListClusters_smoke_test.go
@@ -17,10 +17,6 @@
package dataproc
import (
- dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
-)
-
-import (
"context"
"fmt"
"strconv"
@@ -30,6 +26,7 @@
"cloud.google.com/go/internal/testutil"
"google.golang.org/api/iterator"
"google.golang.org/api/option"
+ dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
)
var _ = fmt.Sprintf
diff --git a/dataproc/apiv1/mock_test.go b/dataproc/apiv1/mock_test.go
index 2389d0a..44d2ff9 100644
--- a/dataproc/apiv1/mock_test.go
+++ b/dataproc/apiv1/mock_test.go
@@ -17,13 +17,6 @@
package dataproc
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
- field_maskpb "google.golang.org/genproto/protobuf/field_mask"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -36,11 +29,17 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+ longrunningpb "google.golang.org/genproto/googleapis/longrunning"
+ field_maskpb "google.golang.org/genproto/protobuf/field_mask"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/dataproc/apiv1beta2/ListClusters_smoke_test.go b/dataproc/apiv1beta2/ListClusters_smoke_test.go
index 8f22a46..87a0e76 100644
--- a/dataproc/apiv1beta2/ListClusters_smoke_test.go
+++ b/dataproc/apiv1beta2/ListClusters_smoke_test.go
@@ -17,10 +17,6 @@
package dataproc
import (
- dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2"
-)
-
-import (
"context"
"fmt"
"strconv"
@@ -30,6 +26,7 @@
"cloud.google.com/go/internal/testutil"
"google.golang.org/api/iterator"
"google.golang.org/api/option"
+ dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2"
)
var _ = fmt.Sprintf
diff --git a/dataproc/apiv1beta2/mock_test.go b/dataproc/apiv1beta2/mock_test.go
index 7e06653..7ce3789 100644
--- a/dataproc/apiv1beta2/mock_test.go
+++ b/dataproc/apiv1beta2/mock_test.go
@@ -17,13 +17,6 @@
package dataproc
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
- field_maskpb "google.golang.org/genproto/protobuf/field_mask"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -36,11 +29,17 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2"
+ longrunningpb "google.golang.org/genproto/googleapis/longrunning"
+ field_maskpb "google.golang.org/genproto/protobuf/field_mask"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/debugger/apiv2/mock_test.go b/debugger/apiv2/mock_test.go
index 24f8f56..6b05daa 100644
--- a/debugger/apiv2/mock_test.go
+++ b/debugger/apiv2/mock_test.go
@@ -17,11 +17,6 @@
package debugger
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- clouddebuggerpb "google.golang.org/genproto/googleapis/devtools/clouddebugger/v2"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -34,11 +29,15 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ clouddebuggerpb "google.golang.org/genproto/googleapis/devtools/clouddebugger/v2"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/dialogflow/apiv2/mock_test.go b/dialogflow/apiv2/mock_test.go
index b141b05..7d4e5d0 100644
--- a/dialogflow/apiv2/mock_test.go
+++ b/dialogflow/apiv2/mock_test.go
@@ -17,12 +17,6 @@
package dialogflow
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -35,11 +29,16 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+ longrunningpb "google.golang.org/genproto/googleapis/longrunning"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/dlp/apiv2/mock_test.go b/dlp/apiv2/mock_test.go
index 463b792..8cc8e04 100644
--- a/dlp/apiv2/mock_test.go
+++ b/dlp/apiv2/mock_test.go
@@ -17,11 +17,6 @@
package dlp
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -34,11 +29,15 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/errorreporting/apiv1beta1/ReportErrorEvent_smoke_test.go b/errorreporting/apiv1beta1/ReportErrorEvent_smoke_test.go
index e9f46a7..54eba56 100644
--- a/errorreporting/apiv1beta1/ReportErrorEvent_smoke_test.go
+++ b/errorreporting/apiv1beta1/ReportErrorEvent_smoke_test.go
@@ -17,10 +17,6 @@
package errorreporting
import (
- clouderrorreportingpb "google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1"
-)
-
-import (
"context"
"fmt"
"strconv"
@@ -30,6 +26,7 @@
"cloud.google.com/go/internal/testutil"
"google.golang.org/api/iterator"
"google.golang.org/api/option"
+ clouderrorreportingpb "google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1"
)
var _ = fmt.Sprintf
diff --git a/errorreporting/apiv1beta1/mock_test.go b/errorreporting/apiv1beta1/mock_test.go
index 43c2b33..4c314e0 100644
--- a/errorreporting/apiv1beta1/mock_test.go
+++ b/errorreporting/apiv1beta1/mock_test.go
@@ -17,10 +17,6 @@
package errorreporting
import (
- clouderrorreportingpb "google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -34,10 +30,13 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"google.golang.org/api/option"
+ clouderrorreportingpb "google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/expr/apiv1alpha1/mock_test.go b/expr/apiv1alpha1/mock_test.go
index 2111b4e..035b0ed 100644
--- a/expr/apiv1alpha1/mock_test.go
+++ b/expr/apiv1alpha1/mock_test.go
@@ -17,10 +17,6 @@
package expr
import (
- exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -34,10 +30,13 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"google.golang.org/api/option"
+ exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/firestore/apiv1/admin/mock_test.go b/firestore/apiv1/admin/mock_test.go
index f44661b..bffe86f 100644
--- a/firestore/apiv1/admin/mock_test.go
+++ b/firestore/apiv1/admin/mock_test.go
@@ -17,12 +17,6 @@
package apiv1
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- adminpb "google.golang.org/genproto/googleapis/firestore/admin/v1"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -35,11 +29,16 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ adminpb "google.golang.org/genproto/googleapis/firestore/admin/v1"
+ longrunningpb "google.golang.org/genproto/googleapis/longrunning"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/firestore/apiv1beta1/mock_test.go b/firestore/apiv1beta1/mock_test.go
index 3acdc01..75ef4fe 100644
--- a/firestore/apiv1beta1/mock_test.go
+++ b/firestore/apiv1beta1/mock_test.go
@@ -17,11 +17,6 @@
package firestore
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- firestorepb "google.golang.org/genproto/googleapis/firestore/v1beta1"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -34,11 +29,15 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ firestorepb "google.golang.org/genproto/googleapis/firestore/v1beta1"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/iam/admin/apiv1/mock_test.go b/iam/admin/apiv1/mock_test.go
index 82bd6cf..b5d8c88 100644
--- a/iam/admin/apiv1/mock_test.go
+++ b/iam/admin/apiv1/mock_test.go
@@ -17,12 +17,6 @@
package admin
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- adminpb "google.golang.org/genproto/googleapis/iam/admin/v1"
- iampb "google.golang.org/genproto/googleapis/iam/v1"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -35,11 +29,16 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ adminpb "google.golang.org/genproto/googleapis/iam/admin/v1"
+ iampb "google.golang.org/genproto/googleapis/iam/v1"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/iam/credentials/apiv1/mock_test.go b/iam/credentials/apiv1/mock_test.go
index 91edcc8..d24f492 100644
--- a/iam/credentials/apiv1/mock_test.go
+++ b/iam/credentials/apiv1/mock_test.go
@@ -17,10 +17,6 @@
package credentials
import (
- credentialspb "google.golang.org/genproto/googleapis/iam/credentials/v1"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -34,10 +30,13 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"google.golang.org/api/option"
+ credentialspb "google.golang.org/genproto/googleapis/iam/credentials/v1"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/internal/kokoro/continuous.sh b/internal/kokoro/continuous.sh
index 5583aac..814da64 100755
--- a/internal/kokoro/continuous.sh
+++ b/internal/kokoro/continuous.sh
@@ -49,7 +49,7 @@
try3() { eval "$*" || eval "$*" || eval "$*"; }
download_deps() {
- if [[ `go version` == *"go1.11"* ]] || [[ `go version` == *"go1.12"* ]]; then
+ if [[ `go version` == *"go1.11"* ]] || [[ `go version` == *"go1.12"* ]] || [[ `go version` == *"go1.13"* ]]; then
export GO111MODULE=on
# All packages, including +build tools, are fetched.
try3 go mod download
diff --git a/internal/kokoro/presubmit.sh b/internal/kokoro/presubmit.sh
index 92e4322..06723ef 100755
--- a/internal/kokoro/presubmit.sh
+++ b/internal/kokoro/presubmit.sh
@@ -39,7 +39,7 @@
try3() { eval "$*" || eval "$*" || eval "$*"; }
download_deps() {
- if [[ `go version` == *"go1.11"* ]] || [[ `go version` == *"go1.12"* ]]; then
+ if [[ `go version` == *"go1.11"* ]] || [[ `go version` == *"go1.12"* ]] || [[ `go version` == *"go1.13"* ]]; then
export GO111MODULE=on
# All packages, including +build tools, are fetched.
try3 go mod download
diff --git a/internal/kokoro/vet.sh b/internal/kokoro/vet.sh
index e46670c..ac9575c 100755
--- a/internal/kokoro/vet.sh
+++ b/internal/kokoro/vet.sh
@@ -14,16 +14,16 @@
# limitations under the License.
# Fail on any error
-set -eo pipefail
+set -e
# Display commands being run
set -x
-# Only run the linter on go1.11, because:
+# Only run the linter on go1.13, because:
# - It needs type aliases (so we can't use anything less than 1.9).
# - It only has to run once per CI (so we just have to pick 1 version).
# - It runs out of memory in go 1.12 https://github.com/dominikh/go-tools/issues/419.
-if [[ `go version` != *"go1.11"* ]]; then
+if [[ `go version` != *"go1.13"* ]]; then
exit 0
fi
@@ -39,11 +39,9 @@
git diff go.mod | tee /dev/stderr | (! read)
git diff go.sum | tee /dev/stderr | (! read)
-# Easier to debug CI.
-pwd
-
# Look at all .go files (ignoring .pb.go files) and make sure they have a Copyright. Fail if any don't.
-git ls-files "*[^.pb].go" | xargs grep -L "\(Copyright [0-9]\{4,\}\)" 2>&1 | tee /dev/stderr | (! read)
+find . -type f -name "*.go" ! -name "*.pb.go" -exec grep -L "\(Copyright [0-9]\{4,\}\)" {} \; 2>&1 | tee /dev/stderr | (! read)
+
gofmt -s -d -l . 2>&1 | tee /dev/stderr | (! read)
goimports -l . 2>&1 | tee /dev/stderr | (! read)
@@ -56,64 +54,52 @@
# Note: since we added the linter after-the-fact, some of the ignored errors here are because we can't change an
# existing interface. (as opposed to us not caring about the error)
golint ./... 2>&1 | ( \
- grep -vE "gen\.go" | \
- grep -vE "receiver name [a-zA-Z]+[0-9]* should be consistent with previous receiver name" | \
- grep -vE "exported const AllUsers|AllAuthenticatedUsers|RoleOwner|SSD|HDD|PRODUCTION|DEVELOPMENT should have comment" | \
- grep -v "exported func Value returns unexported type pretty.val, which can be annoying to use" | \
- grep -v "exported func Increment returns unexported type firestore.increment, which can be annoying to use" | \
- grep -v "ExecuteStreamingSql" | \
- grep -v "MethodExecuteSql should be MethodExecuteSQL" | \
- grep -vE "pubsub\/pstest\/fake\.go.+should have comment or be unexported" | \
- grep -v "ClusterId" | \
- grep -v "InstanceId" | \
- grep -v "firestore.arrayUnion" | \
- grep -v "firestore.arrayRemove" | \
- grep -v "maxAttempts" | \
- grep -v "UptimeCheckIpIterator" | \
- grep -vE "apiv[0-9]+" | \
- grep -v "ALL_CAPS" | \
- grep -v "go-cloud-debug-agent" | \
- grep -v "mock_test" | \
- grep -v "internal/testutil/funcmock.go" | \
- grep -v "internal/backoff" | \
- grep -v "internal/trace" | \
- grep -v "a blank import should be only in a main or test package" | \
- grep -v "method ExecuteSql should be ExecuteSQL" | \
- grep -vE "spanner/spansql/(sql|types).go:.*should have comment" | \
- grep -vE "\.pb\.go:" || true) | tee /dev/stderr | (! read)
+ grep -vE "gen\.go" | \
+ grep -vE "receiver name [a-zA-Z]+[0-9]* should be consistent with previous receiver name" | \
+ grep -vE "exported const AllUsers|AllAuthenticatedUsers|RoleOwner|SSD|HDD|PRODUCTION|DEVELOPMENT should have comment" | \
+ grep -v "exported func Value returns unexported type pretty.val, which can be annoying to use" | \
+ grep -v "exported func Increment returns unexported type firestore.increment, which can be annoying to use" | \
+ grep -v "ExecuteStreamingSql" | \
+ grep -v "MethodExecuteSql should be MethodExecuteSQL" | \
+ grep -vE "pubsub\/pstest\/fake\.go.+should have comment or be unexported" | \
+ grep -v "ClusterId" | \
+ grep -v "InstanceId" | \
+ grep -v "firestore.arrayUnion" | \
+ grep -v "firestore.arrayRemove" | \
+ grep -v "maxAttempts" | \
+ grep -v "UptimeCheckIpIterator" | \
+ grep -vE "apiv[0-9]+" | \
+ grep -v "ALL_CAPS" | \
+ grep -v "go-cloud-debug-agent" | \
+ grep -v "mock_test" | \
+ grep -v "internal/testutil/funcmock.go" | \
+ grep -v "internal/backoff" | \
+ grep -v "internal/trace" | \
+ grep -v "a blank import should be only in a main or test package" | \
+ grep -v "method ExecuteSql should be ExecuteSQL" | \
+ grep -vE "spanner/spansql/(sql|types).go:.*should have comment" | \
+ grep -vE "\.pb\.go:") | \
+ tee /dev/stderr | (! read)
-# TODO(deklerk): It doesn't seem like it, but is it possible to glob both before
-# and after the colon? Then we could do *go-cloud-debug-agent*:*
-staticcheck -go 1.9 -ignore '
-*:S1007
-*:SA1019
-cloud.google.com/go/firestore/internal/doc-snippets.go:*
-cloud.google.com/go/functions/metadata/metadata_test.go:SA1012
-cloud.google.com/go/cmd/go-cloud-debug-agent/internal/controller/client_test.go:*
-cloud.google.com/go/cmd/go-cloud-debug-agent/internal/debug/dwarf/frame.go:*
-cloud.google.com/go/cmd/go-cloud-debug-agent/internal/debug/dwarf/typeunit.go:*
-cloud.google.com/go/cmd/go-cloud-debug-agent/internal/debug/dwarf/const.go:*
-cloud.google.com/go/cmd/go-cloud-debug-agent/internal/debug/dwarf/line.go:*
-cloud.google.com/go/cmd/go-cloud-debug-agent/internal/debug/server/server.go:*
-cloud.google.com/go/cmd/go-cloud-debug-agent/internal/debug/server/dwarf.go:*
-cloud.google.com/go/cmd/go-cloud-debug-agent/internal/debug/server/eval.go:*
-cloud.google.com/go/cmd/go-cloud-debug-agent/internal/debug/server/value.go:*
-cloud.google.com/go/cmd/go-cloud-debug-agent/internal/debug/elf/file.go:*
-cloud.google.com/go/cmd/go-cloud-debug-agent/internal/breakpoints/breakpoints_test.go:*
-cloud.google.com/go/cmd/go-cloud-debug-agent/internal/debug/gosym/pclntab_test.go:*
-cloud.google.com/go/cmd/go-cloud-debug-agent/debuglet.go:*
-cloud.google.com/go/translate/internal/translate/v2/translate-nov2016-gen.go:*
-cloud.google.com/go/storage/bucket.go:S1002
-cloud.google.com/go/spanner/value.go:S1025
-cloud.google.com/go/pubsub/integration_test.go:S1012
-cloud.google.com/go/internal/fields/fold.go:S1008
-cloud.google.com/go/httpreplay/internal/proxy/debug.go:*
-cloud.google.com/go/bigtable/internal/cbtconfig/cbtconfig.go:ST1005
-cloud.google.com/go/bigtable/cmd/cbt/cbt.go:ST1005
-cloud.google.com/go/asset/v1beta1/doc.go:*
-cloud.google.com/go/asset/v1beta1/mock_test.go:*
-cloud.google.com/go/spanner/value_test.go:S1019
-cloud.google.com/go/bigtable/reader.go:S1002
-cloud.google.com/go/internal/btree/btree.go:U1000
-cloud.google.com/go/container/apiv1/mock_test.go:*
-' ./...
+staticcheck -go 1.9 ./... 2>&1 | ( \
+ grep -v S1007 | \
+ grep -v SA1019 | \
+ grep -v firestore/internal/doc-snippets.go | \
+ grep -v functions/metadata/metadata_test.go | \
+ grep -v storage/bucket.go | \
+ grep -v spanner/value.go | \
+ grep -v go-cloud-debug-agent | \
+ grep -v pubsub/integration_test.go | \
+ grep -v internal/fields/fold.go | \
+ grep -v httpreplay/internal/proxy/debug.go | \
+ grep -v bigtable/internal/cbtconfig/cbtconfig.go | \
+ grep -v bigtable/cmd/cbt/cbt.go | \
+ grep -v asset/v1beta1/doc.go | \
+ grep -v asset/v1beta1/mock_test.go | \
+ grep -v spanner/value_test.go | \
+ grep -v bigtable/reader.go | \
+ grep -v internal/btree/btree.go | \
+ grep -v container/apiv1/mock_test.go) | \
+ tee /dev/stderr | (! read)
+
+echo "Done vetting!"
diff --git a/iot/apiv1/ListDeviceRegistries_smoke_test.go b/iot/apiv1/ListDeviceRegistries_smoke_test.go
index e15fb15..b24164d 100644
--- a/iot/apiv1/ListDeviceRegistries_smoke_test.go
+++ b/iot/apiv1/ListDeviceRegistries_smoke_test.go
@@ -17,10 +17,6 @@
package iot
import (
- iotpb "google.golang.org/genproto/googleapis/cloud/iot/v1"
-)
-
-import (
"context"
"fmt"
"strconv"
@@ -30,6 +26,7 @@
"cloud.google.com/go/internal/testutil"
"google.golang.org/api/iterator"
"google.golang.org/api/option"
+ iotpb "google.golang.org/genproto/googleapis/cloud/iot/v1"
)
var _ = fmt.Sprintf
diff --git a/iot/apiv1/mock_test.go b/iot/apiv1/mock_test.go
index a8dd3b7..7b3ea08 100644
--- a/iot/apiv1/mock_test.go
+++ b/iot/apiv1/mock_test.go
@@ -17,13 +17,6 @@
package iot
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- iotpb "google.golang.org/genproto/googleapis/cloud/iot/v1"
- iampb "google.golang.org/genproto/googleapis/iam/v1"
- field_maskpb "google.golang.org/genproto/protobuf/field_mask"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -36,11 +29,17 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ iotpb "google.golang.org/genproto/googleapis/cloud/iot/v1"
+ iampb "google.golang.org/genproto/googleapis/iam/v1"
+ field_maskpb "google.golang.org/genproto/protobuf/field_mask"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/irm/apiv1alpha2/mock_test.go b/irm/apiv1alpha2/mock_test.go
index ee908f9..ea91438 100644
--- a/irm/apiv1alpha2/mock_test.go
+++ b/irm/apiv1alpha2/mock_test.go
@@ -17,11 +17,6 @@
package irm
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- irmpb "google.golang.org/genproto/googleapis/cloud/irm/v1alpha2"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -34,11 +29,15 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ irmpb "google.golang.org/genproto/googleapis/cloud/irm/v1alpha2"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/kms/apiv1/mock_test.go b/kms/apiv1/mock_test.go
index 1267529..5664811 100644
--- a/kms/apiv1/mock_test.go
+++ b/kms/apiv1/mock_test.go
@@ -17,13 +17,6 @@
package kms
import (
- durationpb "github.com/golang/protobuf/ptypes/duration"
- timestamppb "github.com/golang/protobuf/ptypes/timestamp"
- kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1"
- field_maskpb "google.golang.org/genproto/protobuf/field_mask"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -36,11 +29,17 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ durationpb "github.com/golang/protobuf/ptypes/duration"
+ timestamppb "github.com/golang/protobuf/ptypes/timestamp"
"google.golang.org/api/option"
+ kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1"
+ field_maskpb "google.golang.org/genproto/protobuf/field_mask"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/language/apiv1/mock_test.go b/language/apiv1/mock_test.go
index dbfa5d0..0eb6b9b 100644
--- a/language/apiv1/mock_test.go
+++ b/language/apiv1/mock_test.go
@@ -17,10 +17,6 @@
package language
import (
- languagepb "google.golang.org/genproto/googleapis/cloud/language/v1"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -34,10 +30,13 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"google.golang.org/api/option"
+ languagepb "google.golang.org/genproto/googleapis/cloud/language/v1"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/language/apiv1beta2/AnalyzeSentiment_smoke_test.go b/language/apiv1beta2/AnalyzeSentiment_smoke_test.go
index 45e4436..7c1c858 100644
--- a/language/apiv1beta2/AnalyzeSentiment_smoke_test.go
+++ b/language/apiv1beta2/AnalyzeSentiment_smoke_test.go
@@ -17,10 +17,6 @@
package language
import (
- languagepb "google.golang.org/genproto/googleapis/cloud/language/v1beta2"
-)
-
-import (
"context"
"fmt"
"strconv"
@@ -30,6 +26,7 @@
"cloud.google.com/go/internal/testutil"
"google.golang.org/api/iterator"
"google.golang.org/api/option"
+ languagepb "google.golang.org/genproto/googleapis/cloud/language/v1beta2"
)
var _ = fmt.Sprintf
diff --git a/language/apiv1beta2/mock_test.go b/language/apiv1beta2/mock_test.go
index c318648..c40a592 100644
--- a/language/apiv1beta2/mock_test.go
+++ b/language/apiv1beta2/mock_test.go
@@ -17,10 +17,6 @@
package language
import (
- languagepb "google.golang.org/genproto/googleapis/cloud/language/v1beta2"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -34,10 +30,13 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"google.golang.org/api/option"
+ languagepb "google.golang.org/genproto/googleapis/cloud/language/v1beta2"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/logging/apiv2/mock_test.go b/logging/apiv2/mock_test.go
index a5d5cf8..5181f4a 100644
--- a/logging/apiv2/mock_test.go
+++ b/logging/apiv2/mock_test.go
@@ -17,13 +17,6 @@
package logging
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- monitoredrespb "google.golang.org/genproto/googleapis/api/monitoredres"
- loggingpb "google.golang.org/genproto/googleapis/logging/v2"
- field_maskpb "google.golang.org/genproto/protobuf/field_mask"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -36,11 +29,17 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ monitoredrespb "google.golang.org/genproto/googleapis/api/monitoredres"
+ loggingpb "google.golang.org/genproto/googleapis/logging/v2"
+ field_maskpb "google.golang.org/genproto/protobuf/field_mask"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/longrunning/autogen/mock_test.go b/longrunning/autogen/mock_test.go
index 246d8fe..035ea13 100644
--- a/longrunning/autogen/mock_test.go
+++ b/longrunning/autogen/mock_test.go
@@ -17,11 +17,6 @@
package longrunning
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -34,11 +29,15 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ longrunningpb "google.golang.org/genproto/googleapis/longrunning"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/oslogin/apiv1/mock_test.go b/oslogin/apiv1/mock_test.go
index 9908d3b..4088969 100644
--- a/oslogin/apiv1/mock_test.go
+++ b/oslogin/apiv1/mock_test.go
@@ -17,12 +17,6 @@
package oslogin
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- commonpb "google.golang.org/genproto/googleapis/cloud/oslogin/common"
- osloginpb "google.golang.org/genproto/googleapis/cloud/oslogin/v1"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -35,11 +29,16 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ commonpb "google.golang.org/genproto/googleapis/cloud/oslogin/common"
+ osloginpb "google.golang.org/genproto/googleapis/cloud/oslogin/v1"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/oslogin/apiv1beta/mock_test.go b/oslogin/apiv1beta/mock_test.go
index cc24960..7f156c6 100644
--- a/oslogin/apiv1beta/mock_test.go
+++ b/oslogin/apiv1beta/mock_test.go
@@ -17,12 +17,6 @@
package oslogin
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- commonpb "google.golang.org/genproto/googleapis/cloud/oslogin/common"
- osloginpb "google.golang.org/genproto/googleapis/cloud/oslogin/v1beta"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -35,11 +29,16 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ commonpb "google.golang.org/genproto/googleapis/cloud/oslogin/common"
+ osloginpb "google.golang.org/genproto/googleapis/cloud/oslogin/v1beta"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/phishingprotection/apiv1beta1/mock_test.go b/phishingprotection/apiv1beta1/mock_test.go
index 6af8566..0940b39 100644
--- a/phishingprotection/apiv1beta1/mock_test.go
+++ b/phishingprotection/apiv1beta1/mock_test.go
@@ -17,10 +17,6 @@
package phishingprotection
import (
- phishingprotectionpb "google.golang.org/genproto/googleapis/cloud/phishingprotection/v1beta1"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -34,10 +30,13 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"google.golang.org/api/option"
+ phishingprotectionpb "google.golang.org/genproto/googleapis/cloud/phishingprotection/v1beta1"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/pubsub/apiv1/ListTopics_smoke_test.go b/pubsub/apiv1/ListTopics_smoke_test.go
index 1fe3469..2a7f1a5 100644
--- a/pubsub/apiv1/ListTopics_smoke_test.go
+++ b/pubsub/apiv1/ListTopics_smoke_test.go
@@ -17,10 +17,6 @@
package pubsub
import (
- pubsubpb "google.golang.org/genproto/googleapis/pubsub/v1"
-)
-
-import (
"context"
"fmt"
"strconv"
@@ -30,6 +26,7 @@
"cloud.google.com/go/internal/testutil"
"google.golang.org/api/iterator"
"google.golang.org/api/option"
+ pubsubpb "google.golang.org/genproto/googleapis/pubsub/v1"
)
var _ = fmt.Sprintf
diff --git a/pubsub/apiv1/mock_test.go b/pubsub/apiv1/mock_test.go
index ba3decd..2c2205b 100644
--- a/pubsub/apiv1/mock_test.go
+++ b/pubsub/apiv1/mock_test.go
@@ -17,13 +17,6 @@
package pubsub
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- timestamppb "github.com/golang/protobuf/ptypes/timestamp"
- pubsubpb "google.golang.org/genproto/googleapis/pubsub/v1"
- field_maskpb "google.golang.org/genproto/protobuf/field_mask"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -36,11 +29,17 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
+ timestamppb "github.com/golang/protobuf/ptypes/timestamp"
"google.golang.org/api/option"
+ pubsubpb "google.golang.org/genproto/googleapis/pubsub/v1"
+ field_maskpb "google.golang.org/genproto/protobuf/field_mask"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/recaptchaenterprise/apiv1beta1/mock_test.go b/recaptchaenterprise/apiv1beta1/mock_test.go
index e143110..41c7e9c 100644
--- a/recaptchaenterprise/apiv1beta1/mock_test.go
+++ b/recaptchaenterprise/apiv1beta1/mock_test.go
@@ -17,10 +17,6 @@
package recaptchaenterprise
import (
- recaptchaenterprisepb "google.golang.org/genproto/googleapis/cloud/recaptchaenterprise/v1beta1"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -34,10 +30,13 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"google.golang.org/api/option"
+ recaptchaenterprisepb "google.golang.org/genproto/googleapis/cloud/recaptchaenterprise/v1beta1"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/redis/apiv1/mock_test.go b/redis/apiv1/mock_test.go
index a1a498e..f58bf72 100644
--- a/redis/apiv1/mock_test.go
+++ b/redis/apiv1/mock_test.go
@@ -17,13 +17,6 @@
package redis
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- redispb "google.golang.org/genproto/googleapis/cloud/redis/v1"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
- field_maskpb "google.golang.org/genproto/protobuf/field_mask"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -36,11 +29,17 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ redispb "google.golang.org/genproto/googleapis/cloud/redis/v1"
+ longrunningpb "google.golang.org/genproto/googleapis/longrunning"
+ field_maskpb "google.golang.org/genproto/protobuf/field_mask"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/redis/apiv1beta1/mock_test.go b/redis/apiv1beta1/mock_test.go
index ee4cb5d..2303e39 100644
--- a/redis/apiv1beta1/mock_test.go
+++ b/redis/apiv1beta1/mock_test.go
@@ -17,13 +17,6 @@
package redis
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- redispb "google.golang.org/genproto/googleapis/cloud/redis/v1beta1"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
- field_maskpb "google.golang.org/genproto/protobuf/field_mask"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -36,11 +29,17 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ redispb "google.golang.org/genproto/googleapis/cloud/redis/v1beta1"
+ longrunningpb "google.golang.org/genproto/googleapis/longrunning"
+ field_maskpb "google.golang.org/genproto/protobuf/field_mask"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/scheduler/apiv1/mock_test.go b/scheduler/apiv1/mock_test.go
index 5dd838c..f451b65 100644
--- a/scheduler/apiv1/mock_test.go
+++ b/scheduler/apiv1/mock_test.go
@@ -17,12 +17,6 @@
package scheduler
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- schedulerpb "google.golang.org/genproto/googleapis/cloud/scheduler/v1"
- field_maskpb "google.golang.org/genproto/protobuf/field_mask"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -35,11 +29,16 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ schedulerpb "google.golang.org/genproto/googleapis/cloud/scheduler/v1"
+ field_maskpb "google.golang.org/genproto/protobuf/field_mask"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/scheduler/apiv1beta1/mock_test.go b/scheduler/apiv1beta1/mock_test.go
index a72ed0e..6cdd585 100644
--- a/scheduler/apiv1beta1/mock_test.go
+++ b/scheduler/apiv1beta1/mock_test.go
@@ -17,11 +17,6 @@
package scheduler
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- schedulerpb "google.golang.org/genproto/googleapis/cloud/scheduler/v1beta1"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -34,11 +29,15 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ schedulerpb "google.golang.org/genproto/googleapis/cloud/scheduler/v1beta1"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/securitycenter/apiv1/mock_test.go b/securitycenter/apiv1/mock_test.go
index 82affe9..454b183 100644
--- a/securitycenter/apiv1/mock_test.go
+++ b/securitycenter/apiv1/mock_test.go
@@ -17,13 +17,6 @@
package securitycenter
import (
- timestamppb "github.com/golang/protobuf/ptypes/timestamp"
- securitycenterpb "google.golang.org/genproto/googleapis/cloud/securitycenter/v1"
- iampb "google.golang.org/genproto/googleapis/iam/v1"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -36,11 +29,17 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ timestamppb "github.com/golang/protobuf/ptypes/timestamp"
"google.golang.org/api/option"
+ securitycenterpb "google.golang.org/genproto/googleapis/cloud/securitycenter/v1"
+ iampb "google.golang.org/genproto/googleapis/iam/v1"
+ longrunningpb "google.golang.org/genproto/googleapis/longrunning"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/securitycenter/apiv1beta1/mock_test.go b/securitycenter/apiv1beta1/mock_test.go
index 8a3abef..ffc63b3 100644
--- a/securitycenter/apiv1beta1/mock_test.go
+++ b/securitycenter/apiv1beta1/mock_test.go
@@ -17,14 +17,6 @@
package securitycenter
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- timestamppb "github.com/golang/protobuf/ptypes/timestamp"
- securitycenterpb "google.golang.org/genproto/googleapis/cloud/securitycenter/v1beta1"
- iampb "google.golang.org/genproto/googleapis/iam/v1"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -37,11 +29,18 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
+ timestamppb "github.com/golang/protobuf/ptypes/timestamp"
"google.golang.org/api/option"
+ securitycenterpb "google.golang.org/genproto/googleapis/cloud/securitycenter/v1beta1"
+ iampb "google.golang.org/genproto/googleapis/iam/v1"
+ longrunningpb "google.golang.org/genproto/googleapis/longrunning"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/spanner/admin/database/apiv1/mock_test.go b/spanner/admin/database/apiv1/mock_test.go
index 11d61bf..226fb67 100644
--- a/spanner/admin/database/apiv1/mock_test.go
+++ b/spanner/admin/database/apiv1/mock_test.go
@@ -17,13 +17,6 @@
package database
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- iampb "google.golang.org/genproto/googleapis/iam/v1"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
- databasepb "google.golang.org/genproto/googleapis/spanner/admin/database/v1"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -36,11 +29,17 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ iampb "google.golang.org/genproto/googleapis/iam/v1"
+ longrunningpb "google.golang.org/genproto/googleapis/longrunning"
+ databasepb "google.golang.org/genproto/googleapis/spanner/admin/database/v1"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/spanner/admin/instance/apiv1/mock_test.go b/spanner/admin/instance/apiv1/mock_test.go
index 59ec13a..c0d2654 100644
--- a/spanner/admin/instance/apiv1/mock_test.go
+++ b/spanner/admin/instance/apiv1/mock_test.go
@@ -17,14 +17,6 @@
package instance
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- iampb "google.golang.org/genproto/googleapis/iam/v1"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
- instancepb "google.golang.org/genproto/googleapis/spanner/admin/instance/v1"
- field_maskpb "google.golang.org/genproto/protobuf/field_mask"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -37,11 +29,18 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ iampb "google.golang.org/genproto/googleapis/iam/v1"
+ longrunningpb "google.golang.org/genproto/googleapis/longrunning"
+ instancepb "google.golang.org/genproto/googleapis/spanner/admin/instance/v1"
+ field_maskpb "google.golang.org/genproto/protobuf/field_mask"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/spanner/apiv1/mock_test.go b/spanner/apiv1/mock_test.go
index 7ad932a..90c4b71 100644
--- a/spanner/apiv1/mock_test.go
+++ b/spanner/apiv1/mock_test.go
@@ -17,11 +17,6 @@
package spanner
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- spannerpb "google.golang.org/genproto/googleapis/spanner/v1"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -34,11 +29,15 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ spannerpb "google.golang.org/genproto/googleapis/spanner/v1"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/speech/apiv1/Recognize_smoke_test.go b/speech/apiv1/Recognize_smoke_test.go
index 826f18f..e4d818a 100644
--- a/speech/apiv1/Recognize_smoke_test.go
+++ b/speech/apiv1/Recognize_smoke_test.go
@@ -17,10 +17,6 @@
package speech
import (
- speechpb "google.golang.org/genproto/googleapis/cloud/speech/v1"
-)
-
-import (
"context"
"fmt"
"strconv"
@@ -30,6 +26,7 @@
"cloud.google.com/go/internal/testutil"
"google.golang.org/api/iterator"
"google.golang.org/api/option"
+ speechpb "google.golang.org/genproto/googleapis/cloud/speech/v1"
)
var _ = fmt.Sprintf
diff --git a/speech/apiv1/mock_test.go b/speech/apiv1/mock_test.go
index df2b6d5..7ef0da0 100644
--- a/speech/apiv1/mock_test.go
+++ b/speech/apiv1/mock_test.go
@@ -17,11 +17,6 @@
package speech
import (
- speechpb "google.golang.org/genproto/googleapis/cloud/speech/v1"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -35,10 +30,14 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"google.golang.org/api/option"
+ speechpb "google.golang.org/genproto/googleapis/cloud/speech/v1"
+ longrunningpb "google.golang.org/genproto/googleapis/longrunning"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/speech/apiv1p1beta1/Recognize_smoke_test.go b/speech/apiv1p1beta1/Recognize_smoke_test.go
index 58cf888..26590a8 100644
--- a/speech/apiv1p1beta1/Recognize_smoke_test.go
+++ b/speech/apiv1p1beta1/Recognize_smoke_test.go
@@ -17,10 +17,6 @@
package speech
import (
- speechpb "google.golang.org/genproto/googleapis/cloud/speech/v1p1beta1"
-)
-
-import (
"context"
"fmt"
"strconv"
@@ -30,6 +26,7 @@
"cloud.google.com/go/internal/testutil"
"google.golang.org/api/iterator"
"google.golang.org/api/option"
+ speechpb "google.golang.org/genproto/googleapis/cloud/speech/v1p1beta1"
)
var _ = fmt.Sprintf
diff --git a/speech/apiv1p1beta1/mock_test.go b/speech/apiv1p1beta1/mock_test.go
index 2c5a649..b30a449 100644
--- a/speech/apiv1p1beta1/mock_test.go
+++ b/speech/apiv1p1beta1/mock_test.go
@@ -17,11 +17,6 @@
package speech
import (
- speechpb "google.golang.org/genproto/googleapis/cloud/speech/v1p1beta1"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -35,10 +30,14 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"google.golang.org/api/option"
+ speechpb "google.golang.org/genproto/googleapis/cloud/speech/v1p1beta1"
+ longrunningpb "google.golang.org/genproto/googleapis/longrunning"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/talent/apiv4beta1/mock_test.go b/talent/apiv4beta1/mock_test.go
index f25f359..2fdd3a3 100644
--- a/talent/apiv4beta1/mock_test.go
+++ b/talent/apiv4beta1/mock_test.go
@@ -17,12 +17,6 @@
package talent
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- talentpb "google.golang.org/genproto/googleapis/cloud/talent/v4beta1"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -35,11 +29,16 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ talentpb "google.golang.org/genproto/googleapis/cloud/talent/v4beta1"
+ longrunningpb "google.golang.org/genproto/googleapis/longrunning"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/texttospeech/apiv1/mock_test.go b/texttospeech/apiv1/mock_test.go
index 2627692..59ddea1 100644
--- a/texttospeech/apiv1/mock_test.go
+++ b/texttospeech/apiv1/mock_test.go
@@ -17,10 +17,6 @@
package texttospeech
import (
- texttospeechpb "google.golang.org/genproto/googleapis/cloud/texttospeech/v1"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -34,10 +30,13 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"google.golang.org/api/option"
+ texttospeechpb "google.golang.org/genproto/googleapis/cloud/texttospeech/v1"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/trace/apiv1/ListTraces_smoke_test.go b/trace/apiv1/ListTraces_smoke_test.go
index b08ca50..44611d9 100644
--- a/trace/apiv1/ListTraces_smoke_test.go
+++ b/trace/apiv1/ListTraces_smoke_test.go
@@ -17,10 +17,6 @@
package trace
import (
- cloudtracepb "google.golang.org/genproto/googleapis/devtools/cloudtrace/v1"
-)
-
-import (
"context"
"fmt"
"strconv"
@@ -30,6 +26,7 @@
"cloud.google.com/go/internal/testutil"
"google.golang.org/api/iterator"
"google.golang.org/api/option"
+ cloudtracepb "google.golang.org/genproto/googleapis/devtools/cloudtrace/v1"
)
var _ = fmt.Sprintf
diff --git a/trace/apiv1/mock_test.go b/trace/apiv1/mock_test.go
index 7790b62..0cf5fcc 100644
--- a/trace/apiv1/mock_test.go
+++ b/trace/apiv1/mock_test.go
@@ -17,11 +17,6 @@
package trace
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- cloudtracepb "google.golang.org/genproto/googleapis/devtools/cloudtrace/v1"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -34,11 +29,15 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ cloudtracepb "google.golang.org/genproto/googleapis/devtools/cloudtrace/v1"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/trace/apiv2/BatchWriteSpans_smoke_test.go b/trace/apiv2/BatchWriteSpans_smoke_test.go
index a878d4f..2368126 100644
--- a/trace/apiv2/BatchWriteSpans_smoke_test.go
+++ b/trace/apiv2/BatchWriteSpans_smoke_test.go
@@ -17,10 +17,6 @@
package trace
import (
- cloudtracepb "google.golang.org/genproto/googleapis/devtools/cloudtrace/v2"
-)
-
-import (
"context"
"fmt"
"strconv"
@@ -30,6 +26,7 @@
"cloud.google.com/go/internal/testutil"
"google.golang.org/api/iterator"
"google.golang.org/api/option"
+ cloudtracepb "google.golang.org/genproto/googleapis/devtools/cloudtrace/v2"
)
var _ = fmt.Sprintf
diff --git a/trace/apiv2/mock_test.go b/trace/apiv2/mock_test.go
index 0d35451..029d852 100644
--- a/trace/apiv2/mock_test.go
+++ b/trace/apiv2/mock_test.go
@@ -17,12 +17,6 @@
package trace
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- timestamppb "github.com/golang/protobuf/ptypes/timestamp"
- cloudtracepb "google.golang.org/genproto/googleapis/devtools/cloudtrace/v2"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -35,11 +29,16 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
+ timestamppb "github.com/golang/protobuf/ptypes/timestamp"
"google.golang.org/api/option"
+ cloudtracepb "google.golang.org/genproto/googleapis/devtools/cloudtrace/v2"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/videointelligence/apiv1/AnnotateVideo_smoke_test.go b/videointelligence/apiv1/AnnotateVideo_smoke_test.go
index 6e8104c..78d6389 100644
--- a/videointelligence/apiv1/AnnotateVideo_smoke_test.go
+++ b/videointelligence/apiv1/AnnotateVideo_smoke_test.go
@@ -17,10 +17,6 @@
package videointelligence
import (
- videointelligencepb "google.golang.org/genproto/googleapis/cloud/videointelligence/v1"
-)
-
-import (
"context"
"fmt"
"strconv"
@@ -30,6 +26,7 @@
"cloud.google.com/go/internal/testutil"
"google.golang.org/api/iterator"
"google.golang.org/api/option"
+ videointelligencepb "google.golang.org/genproto/googleapis/cloud/videointelligence/v1"
)
var _ = fmt.Sprintf
diff --git a/videointelligence/apiv1/mock_test.go b/videointelligence/apiv1/mock_test.go
index ab01218..58efa0e 100644
--- a/videointelligence/apiv1/mock_test.go
+++ b/videointelligence/apiv1/mock_test.go
@@ -17,11 +17,6 @@
package videointelligence
import (
- videointelligencepb "google.golang.org/genproto/googleapis/cloud/videointelligence/v1"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -35,10 +30,14 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"google.golang.org/api/option"
+ videointelligencepb "google.golang.org/genproto/googleapis/cloud/videointelligence/v1"
+ longrunningpb "google.golang.org/genproto/googleapis/longrunning"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/videointelligence/apiv1beta1/mock_test.go b/videointelligence/apiv1beta1/mock_test.go
index 6514196..61949f5 100644
--- a/videointelligence/apiv1beta1/mock_test.go
+++ b/videointelligence/apiv1beta1/mock_test.go
@@ -17,11 +17,6 @@
package videointelligence
import (
- videointelligencepb "google.golang.org/genproto/googleapis/cloud/videointelligence/v1beta1"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -35,10 +30,14 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"google.golang.org/api/option"
+ videointelligencepb "google.golang.org/genproto/googleapis/cloud/videointelligence/v1beta1"
+ longrunningpb "google.golang.org/genproto/googleapis/longrunning"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/videointelligence/apiv1beta2/mock_test.go b/videointelligence/apiv1beta2/mock_test.go
index 6aa7183..8ff823e 100644
--- a/videointelligence/apiv1beta2/mock_test.go
+++ b/videointelligence/apiv1beta2/mock_test.go
@@ -17,11 +17,6 @@
package videointelligence
import (
- videointelligencepb "google.golang.org/genproto/googleapis/cloud/videointelligence/v1beta2"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -35,10 +30,14 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"google.golang.org/api/option"
+ videointelligencepb "google.golang.org/genproto/googleapis/cloud/videointelligence/v1beta2"
+ longrunningpb "google.golang.org/genproto/googleapis/longrunning"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/vision/apiv1/BatchAnnotateImages_smoke_test.go b/vision/apiv1/BatchAnnotateImages_smoke_test.go
index 886d2c1..1d13b70 100644
--- a/vision/apiv1/BatchAnnotateImages_smoke_test.go
+++ b/vision/apiv1/BatchAnnotateImages_smoke_test.go
@@ -17,10 +17,6 @@
package vision
import (
- visionpb "google.golang.org/genproto/googleapis/cloud/vision/v1"
-)
-
-import (
"context"
"fmt"
"strconv"
@@ -30,6 +26,7 @@
"cloud.google.com/go/internal/testutil"
"google.golang.org/api/iterator"
"google.golang.org/api/option"
+ visionpb "google.golang.org/genproto/googleapis/cloud/vision/v1"
)
var _ = fmt.Sprintf
diff --git a/vision/apiv1/mock_test.go b/vision/apiv1/mock_test.go
index 3612206..12885a7 100644
--- a/vision/apiv1/mock_test.go
+++ b/vision/apiv1/mock_test.go
@@ -17,12 +17,6 @@
package vision
import (
- emptypb "github.com/golang/protobuf/ptypes/empty"
- visionpb "google.golang.org/genproto/googleapis/cloud/vision/v1"
- longrunningpb "google.golang.org/genproto/googleapis/longrunning"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -35,11 +29,16 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
+ emptypb "github.com/golang/protobuf/ptypes/empty"
"google.golang.org/api/option"
+ visionpb "google.golang.org/genproto/googleapis/cloud/vision/v1"
+ longrunningpb "google.golang.org/genproto/googleapis/longrunning"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/vision/apiv1p1beta1/BatchAnnotateImages_smoke_test.go b/vision/apiv1p1beta1/BatchAnnotateImages_smoke_test.go
index 889421c..955f56c 100644
--- a/vision/apiv1p1beta1/BatchAnnotateImages_smoke_test.go
+++ b/vision/apiv1p1beta1/BatchAnnotateImages_smoke_test.go
@@ -17,10 +17,6 @@
package vision
import (
- visionpb "google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1"
-)
-
-import (
"context"
"fmt"
"strconv"
@@ -30,6 +26,7 @@
"cloud.google.com/go/internal/testutil"
"google.golang.org/api/iterator"
"google.golang.org/api/option"
+ visionpb "google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1"
)
var _ = fmt.Sprintf
diff --git a/vision/apiv1p1beta1/mock_test.go b/vision/apiv1p1beta1/mock_test.go
index 77e9bbb..b5906a7 100644
--- a/vision/apiv1p1beta1/mock_test.go
+++ b/vision/apiv1p1beta1/mock_test.go
@@ -17,10 +17,6 @@
package vision
import (
- visionpb "google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -34,10 +30,13 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"google.golang.org/api/option"
+ visionpb "google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
diff --git a/webrisk/apiv1beta1/mock_test.go b/webrisk/apiv1beta1/mock_test.go
index f08a3ea..8e6dc3f 100644
--- a/webrisk/apiv1beta1/mock_test.go
+++ b/webrisk/apiv1beta1/mock_test.go
@@ -17,10 +17,6 @@
package webrisk
import (
- webriskpb "google.golang.org/genproto/googleapis/cloud/webrisk/v1beta1"
-)
-
-import (
"context"
"flag"
"fmt"
@@ -34,10 +30,13 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"google.golang.org/api/option"
+ webriskpb "google.golang.org/genproto/googleapis/cloud/webrisk/v1beta1"
+
status "google.golang.org/genproto/googleapis/rpc/status"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
+
gstatus "google.golang.org/grpc/status"
)
