Add a flag to skip tests using Cloud Logging API

internal/testflags/testflags.go

@@ -0,0 +1,20 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package testflags
+
+import "flag"
+
+// SkipCloudLogging is a flag of program arguments on testing.  Unit tests using Cloud Logging APIs are skipped with this flag.
+var SkipCloudLogging = flag.Bool("skip-cloud-logging", false, "skip tests that require cloud logging")

pkg/common/cache/cache_test.go

@@ -21,6 +21,8 @@ import (
 	"testing"
 
 	"github.com/GoogleCloudPlatform/khi/pkg/common"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 type testOnMemoryCacheItemStorageProvider struct {

pkg/common/cache/gzip_test.go

@@ -17,6 +17,8 @@ package cache
 import (
 	"crypto/rand"
 	"testing"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestGZipCacheItemStorageProvider(t *testing.T) {

pkg/common/cache/lru_test.go

@@ -19,6 +19,8 @@ import (
 	"fmt"
 	"sync"
 	"testing"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestTouchKeyAndGetRemoved(t *testing.T) {

pkg/common/collection_test.go

@@ -20,6 +20,8 @@ import (
 	"sort" // Import the sort package
 
 	"github.com/google/go-cmp/cmp"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestDedupStringArray(t *testing.T) {

pkg/common/concurrent_counter_test.go

@@ -18,6 +18,8 @@ import (
 	"fmt"
 	"sync"
 	"testing"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestConcurrentCounter(t *testing.T) {

pkg/common/errorreport/reporter_test.go

@@ -20,6 +20,8 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestCloudErrorReportWriterKeepWorkingWhenReporterFailsToWrite(t *testing.T) {

pkg/common/flag/flag_test.go

@@ -20,6 +20,8 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func setCommandlineArguments(t *testing.T, arguments []string) {

pkg/common/grouper/basic_test.go

@@ -18,6 +18,8 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestBasicGrouper(t *testing.T) {

pkg/common/httpclient/basic_http_client_test.go

@@ -21,6 +21,8 @@ import (
 	"net/http/httptest"
 	"testing"
 	"time"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 type mockHeaderProvider struct {

pkg/common/httpclient/json_response_client_test.go

@@ -22,6 +22,8 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 type mockHttpClient struct {

pkg/common/httpclient/retry_client_test.go

@@ -24,6 +24,8 @@ import (
 	"time"
 
 	"github.com/GoogleCloudPlatform/khi/pkg/common/token"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 type mockFailClient struct {

pkg/common/id_test.go

@@ -14,7 +14,11 @@
 
 package common
 
-import "testing"
+import (
+	"testing"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
+)
 
 func TestNewUUID(t *testing.T) {
 	uuid1 := NewUUID()

pkg/common/parserutil/converter_test.go

@@ -18,6 +18,8 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestStripSpecialSequences(t *testing.T) {

pkg/common/sharding_map_test.go

@@ -19,6 +19,8 @@ import (
 	"sync"
 	"testing"
 	"time"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 const keyLetters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"

pkg/common/time_test.go

@@ -18,6 +18,8 @@ import (
 	"fmt"
 	"testing"
 	"time"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestParseTime(t *testing.T) {

pkg/common/token/multi_resolver_test.go

@@ -17,6 +17,8 @@ package token
 import (
 	"context"
 	"testing"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestMultiTokenResolver_Resolve(t *testing.T) {

pkg/common/token/store_test.go

@@ -19,6 +19,8 @@ import (
 	"sync"
 	"testing"
 	"time"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestBasicTokenStore_GetType(t *testing.T) {

pkg/common/token/token_refresher_test.go

@@ -18,6 +18,8 @@ import (
 	"context"
 	"testing"
 	"time"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestNewMultiTokenStoreRefresher(t *testing.T) {

pkg/common/token/token_test.go

@@ -17,6 +17,8 @@ package token
 import (
 	"testing"
 	"time"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestNew(t *testing.T) {

pkg/inspection/common/task_registrer_test.go

@@ -19,6 +19,8 @@ import (
 
 	"github.com/GoogleCloudPlatform/khi/pkg/inspection"
 	inspection_test "github.com/GoogleCloudPlatform/khi/pkg/testutil/inspection"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestInspectionTasksAreResolvable(t *testing.T) {

pkg/inspection/form/textform_test.go

@@ -24,6 +24,8 @@ import (
 	common_task "github.com/GoogleCloudPlatform/khi/pkg/task"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func generateFakeVariableSet(taskId string, value string) *common_task.VariableSet {

pkg/inspection/inspectiondata/result_repository_test.go

@@ -19,6 +19,8 @@ import (
 
 	"github.com/GoogleCloudPlatform/khi/pkg/testutil"
 	"github.com/google/go-cmp/cmp"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestFileSystemResultRepository(t *testing.T) {

pkg/inspection/ioconfig/ioconfig_test.go

@@ -20,6 +20,8 @@ import (
 	"testing"
 
 	task_test "github.com/GoogleCloudPlatform/khi/pkg/testutil/task"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestTestIOConfigCanFindTheRoot(t *testing.T) {

pkg/inspection/logger/logger_test.go

@@ -22,6 +22,8 @@ import (
 
 	"github.com/GoogleCloudPlatform/khi/pkg/task/taskid"
 	"github.com/GoogleCloudPlatform/khi/pkg/testutil"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestGlobalLoggerHandlerWithChildLogger(t *testing.T) {

pkg/inspection/metadata/error/conformance_test.go

@@ -18,6 +18,8 @@ import (
 	"testing"
 
 	metadata_test "github.com/GoogleCloudPlatform/khi/pkg/testutil/metadata"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestProgressConformance(t *testing.T) {

pkg/inspection/metadata/form/conformance_test.go

@@ -19,6 +19,8 @@ import (
 
 	"github.com/GoogleCloudPlatform/khi/pkg/inspection/metadata"
 	metadata_test "github.com/GoogleCloudPlatform/khi/pkg/testutil/metadata"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func newFormFieldsForConformanceTest() metadata.Metadata {

pkg/inspection/metadata/form/form_test.go

@@ -19,6 +19,8 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func fieldWithIdAndPriorityForTest(id string, priority int) FormField {

pkg/inspection/metadata/header/conformance_test.go

@@ -18,6 +18,8 @@ import (
 	"testing"
 
 	metadata_test "github.com/GoogleCloudPlatform/khi/pkg/testutil/metadata"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestConformance(t *testing.T) {

pkg/inspection/metadata/logger/logger_test.go

@@ -23,6 +23,8 @@ import (
 	"github.com/GoogleCloudPlatform/khi/pkg/inspection/logger"
 	"github.com/GoogleCloudPlatform/khi/pkg/task/taskid"
 	metadata_test "github.com/GoogleCloudPlatform/khi/pkg/testutil/metadata"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestConformance(t *testing.T) {

pkg/inspection/metadata/logger/throttle_test.go

@@ -16,6 +16,8 @@ package logger
 
 import (
 	"testing"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestConstantLogThrottle(t *testing.T) {

pkg/inspection/metadata/metadata_test.go

@@ -20,6 +20,8 @@ import (
 
 	"github.com/GoogleCloudPlatform/khi/pkg/task"
 	"github.com/google/go-cmp/cmp"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 // Metadata test utility used from tests in another package

pkg/inspection/metadata/plan/plan_test.go

@@ -18,6 +18,8 @@ import (
 	"testing"
 
 	metadata_test "github.com/GoogleCloudPlatform/khi/pkg/testutil/metadata"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestConformance(t *testing.T) {

pkg/inspection/metadata/progress/conformance_test.go

@@ -19,6 +19,8 @@ import (
 
 	"github.com/GoogleCloudPlatform/khi/pkg/inspection/metadata"
 	metadata_test "github.com/GoogleCloudPlatform/khi/pkg/testutil/metadata"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func newProgressforConformanceTest() metadata.Metadata {

pkg/inspection/metadata/progress/indeterminate_updator_test.go

@@ -20,6 +20,8 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestIndeterminateUpdator(t *testing.T) {

pkg/inspection/metadata/progress/progress_test.go

@@ -19,6 +19,8 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestGetTaskProgress(t *testing.T) {

pkg/inspection/metadata/query/query_test.go

@@ -19,6 +19,8 @@ import (
 
 	metadata_test "github.com/GoogleCloudPlatform/khi/pkg/testutil/metadata"
 	"github.com/google/go-cmp/cmp"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestQueryConformance(t *testing.T) {

pkg/log/cached_log_field_extractor_test.go

@@ -19,6 +19,8 @@ import (
 	"time"
 
 	"github.com/GoogleCloudPlatform/khi/pkg/model/enum"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 type commonLogFieldExtractorStub struct {

pkg/log/log_entity_test.go

@@ -13,3 +13,7 @@
 // limitations under the License.
 
 package log
+
+import (
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
+)

pkg/log/structure/adapter/any_test.go

@@ -18,6 +18,8 @@ import (
 	"testing"
 
 	"github.com/GoogleCloudPlatform/khi/pkg/log/structure/structuredatastore"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestAnyAdapter(t *testing.T) {

pkg/log/structure/adapter/direct_test.go

@@ -19,6 +19,8 @@ import (
 
 	"github.com/GoogleCloudPlatform/khi/pkg/log/structure/structuredata"
 	"github.com/GoogleCloudPlatform/khi/pkg/log/structure/structuredatastore"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestDirectAdapter(t *testing.T) {

pkg/log/structure/adapter/merge_yaml_test.go

@@ -19,6 +19,8 @@ import (
 
 	"github.com/GoogleCloudPlatform/khi/pkg/log/structure/merger"
 	"github.com/GoogleCloudPlatform/khi/pkg/log/structure/structuredatastore"
+
+	_ "github.com/GoogleCloudPlatform/khi/internal/testflags"
 )
 
 func TestYamlMergeAdapterTest(t *testing.T) {