Merge branch 'main' into refactor-reorganize-auth-and-credential

TerryHowe · web-flow · commit 7fecafcc700a · 2025-10-10T09:14:45.000-06:00
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -46,8 +46,8 @@ jobs:
           go-version: ${{ matrix.go-version }}
           check-latest: true
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: go
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4
diff --git a/content/file/file.go b/content/file/file.go
@@ -39,7 +39,7 @@ import (
 // bufPool is a pool of byte buffers that can be reused for copying content
 // between files.
 var bufPool = sync.Pool{
-	New: func() interface{} {
+	New: func() any {
 		// the buffer size should be larger than or equal to 128 KiB
 		// for performance considerations.
 		// we choose 1 MiB here so there will be less disk I/O.
@@ -174,7 +174,7 @@ func (s *Store) Close() error {
 	s.setClosed()
 
 	var errs []string
-	s.tmpFiles.Range(func(name, _ interface{}) bool {
+	s.tmpFiles.Range(func(name, _ any) bool {
 		if err := os.Remove(name.(string)); err != nil {
 			errs = append(errs, err.Error())
 		}
diff --git a/content/file/file_test.go b/content/file/file_test.go
@@ -82,7 +82,7 @@ func (m *storageMock) Fetch(ctx context.Context, desc ocispec.Descriptor) (io.Re
 }
 
 func TestStoreInterface(t *testing.T) {
-	var store interface{} = &Store{}
+	var store any = &Store{}
 	if _, ok := store.(oras.Target); !ok {
 		t.Error("&Store{} does not conform oras.Target")
 	}
@@ -2227,7 +2227,7 @@ func TestStore_File_Push_Concurrent(t *testing.T) {
 
 	concurrency := 64
 	eg, egCtx := errgroup.WithContext(ctx)
-	for i := 0; i < concurrency; i++ {
+	for i := range concurrency {
 		eg.Go(func(i int) func() error {
 			return func() error {
 				if err := s.Push(egCtx, desc, bytes.NewReader(content)); err != nil {
@@ -2296,7 +2296,7 @@ func TestStore_File_Fetch_Concurrent(t *testing.T) {
 	concurrency := 64
 	eg, egCtx := errgroup.WithContext(ctx)
 
-	for i := 0; i < concurrency; i++ {
+	for i := range concurrency {
 		eg.Go(func(i int) func() error {
 			return func() error {
 				rc, err := s.Fetch(egCtx, desc)
diff --git a/content/memory/memory_test.go b/content/memory/memory_test.go
@@ -40,7 +40,7 @@ import (
 )
 
 func TestStoreInterface(t *testing.T) {
-	var store interface{} = &Store{}
+	var store any = &Store{}
 	if _, ok := store.(oras.Target); !ok {
 		t.Error("&Store{} does not conform oras.Target")
 	}
diff --git a/content/oci/oci_test.go b/content/oci/oci_test.go
@@ -70,7 +70,7 @@ func (t *storageTracker) Exists(ctx context.Context, target ocispec.Descriptor)
 }
 
 func TestStoreInterface(t *testing.T) {
-	var store interface{} = &Store{}
+	var store any = &Store{}
 	if _, ok := store.(oras.GraphTarget); !ok {
 		t.Error("&Store{} does not conform oras.Target")
 	}
diff --git a/content/oci/readonlyoci_test.go b/content/oci/readonlyoci_test.go
@@ -42,7 +42,7 @@ import (
 )
 
 func TestReadonlyStoreInterface(t *testing.T) {
-	var store interface{} = &ReadOnlyStore{}
+	var store any = &ReadOnlyStore{}
 	if _, ok := store.(oras.ReadOnlyGraphTarget); !ok {
 		t.Error("&ReadOnlyStore{} does not conform oras.ReadOnlyGraphTarget")
 	}
diff --git a/content/oci/storage.go b/content/oci/storage.go
@@ -33,7 +33,7 @@ import (
 // bufPool is a pool of byte buffers that can be reused for copying content
 // between files.
 var bufPool = sync.Pool{
-	New: func() interface{} {
+	New: func() any {
 		// the buffer size should be larger than or equal to 128 KiB
 		// for performance considerations.
 		// we choose 1 MiB here so there will be less disk I/O.
diff --git a/content/oci/storage_test.go b/content/oci/storage_test.go
@@ -232,7 +232,7 @@ func TestStorage_Push_Concurrent(t *testing.T) {
 
 	concurrency := 64
 	eg, egCtx := errgroup.WithContext(ctx)
-	for i := 0; i < concurrency; i++ {
+	for i := range concurrency {
 		eg.Go(func(i int) func() error {
 			return func() error {
 				if err := s.Push(egCtx, desc, bytes.NewReader(content)); err != nil {
@@ -346,7 +346,7 @@ func TestStorage_Fetch_Concurrent(t *testing.T) {
 	concurrency := 64
 	eg, egCtx := errgroup.WithContext(ctx)
 
-	for i := 0; i < concurrency; i++ {
+	for i := range concurrency {
 		eg.Go(func(i int) func() error {
 			return func() error {
 				rc, err := s.Fetch(egCtx, desc)
diff --git a/internal/cas/memory.go b/internal/cas/memory.go
@@ -80,7 +80,7 @@ func (m *Memory) Exists(_ context.Context, target ocispec.Descriptor) (bool, err
 // necessarily correspond to any consistent snapshot of the storage contents.
 func (m *Memory) Map() map[descriptor.Descriptor][]byte {
 	res := make(map[descriptor.Descriptor][]byte)
-	m.content.Range(func(key, value interface{}) bool {
+	m.content.Range(func(key, value any) bool {
 		res[key.(descriptor.Descriptor)] = value.([]byte)
 		return true
 	})
diff --git a/internal/syncutil/once.go b/internal/syncutil/once.go
@@ -24,7 +24,7 @@ import (
 // Once is an object that will perform exactly one action.
 // Unlike sync.Once, this Once allows the action to have return values.
 type Once struct {
-	result interface{}
+	result any
 	err    error
 	status chan bool
 }
@@ -46,7 +46,7 @@ func NewOnce() *Once {
 // Besides the return value of the function f, including the error, Do returns
 // true if the function f passed is called first and is not cancelled, deadline
 // exceeded, or panicking. Otherwise, returns false.
-func (o *Once) Do(ctx context.Context, f func() (interface{}, error)) (bool, interface{}, error) {
+func (o *Once) Do(ctx context.Context, f func() (any, error)) (bool, any, error) {
 	defer func() {
 		if r := recover(); r != nil {
 			o.status <- true
diff --git a/internal/syncutil/once_test.go b/internal/syncutil/once_test.go
@@ -28,18 +28,18 @@ import (
 )
 
 func TestOnce_Do(t *testing.T) {
-	var f []func() (interface{}, error)
-	for i := 0; i < 100; i++ {
-		f = append(f, func(i int) func() (interface{}, error) {
-			return func() (interface{}, error) {
+	var f []func() (any, error)
+	for i := range 100 {
+		f = append(f, func(i int) func() (any, error) {
+			return func() (any, error) {
 				return i + 1, errors.New(strconv.Itoa(i))
 			}
 		}(i))
 	}
 
 	once := NewOnce()
 	first := make([]bool, len(f))
-	result := make([]interface{}, len(f))
+	result := make([]any, len(f))
 	err := make([]error, len(f))
 	var wg sync.WaitGroup
 	for i := 0; i < len(f); i++ {
@@ -89,14 +89,14 @@ func TestOnce_Do_Cancel_Context(t *testing.T) {
 	var wg sync.WaitGroup
 	var (
 		first  bool
-		result interface{}
+		result any
 		err    error
 	)
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
 		ctx := context.Background()
-		first, result, err = once.Do(ctx, func() (interface{}, error) {
+		first, result, err = once.Do(ctx, func() (any, error) {
 			time.Sleep(200 * time.Millisecond)
 			return "foo", io.EOF
 		})
@@ -105,7 +105,7 @@ func TestOnce_Do_Cancel_Context(t *testing.T) {
 	ctx := context.Background()
 	ctx, cancel := context.WithCancel(ctx)
 	cancel()
-	first2, result2, err2 := once.Do(ctx, func() (interface{}, error) {
+	first2, result2, err2 := once.Do(ctx, func() (any, error) {
 		return "bar", nil
 	})
 	wg.Wait()
@@ -126,7 +126,7 @@ func TestOnce_Do_Cancel_Context(t *testing.T) {
 	if wantErr := context.Canceled; err2 != wantErr {
 		t.Fatalf("Once.Do() error = %v, wantErr %v", err2, wantErr)
 	}
-	if wantResult := interface{}(nil); !reflect.DeepEqual(result2, wantResult) {
+	if wantResult := any(nil); !reflect.DeepEqual(result2, wantResult) {
 		t.Fatalf("Once.Do() result = %v, want %v", result2, wantResult)
 	}
 }
@@ -135,7 +135,7 @@ func TestOnce_Do_Cancel_Function(t *testing.T) {
 	ctx := context.Background()
 	once := NewOnce()
 
-	first, result, err := once.Do(ctx, func() (interface{}, error) {
+	first, result, err := once.Do(ctx, func() (any, error) {
 		return "foo", context.Canceled
 	})
 	if wantFirst := false; first != wantFirst {
@@ -144,11 +144,11 @@ func TestOnce_Do_Cancel_Function(t *testing.T) {
 	if wantErr := context.Canceled; err != wantErr {
 		t.Fatalf("Once.Do() error = %v, wantErr %v", err, wantErr)
 	}
-	if wantResult := interface{}(nil); !reflect.DeepEqual(result, wantResult) {
+	if wantResult := any(nil); !reflect.DeepEqual(result, wantResult) {
 		t.Fatalf("Once.Do() result = %v, want %v", result, wantResult)
 	}
 
-	first, result, err = once.Do(ctx, func() (interface{}, error) {
+	first, result, err = once.Do(ctx, func() (any, error) {
 		return "bar", io.EOF
 	})
 	if wantFirst := true; first != wantFirst {
@@ -174,12 +174,12 @@ func TestOnce_Do_Cancel_Panic(t *testing.T) {
 				t.Fatalf("Once.Do() panic = %v, want %v", got, want)
 			}
 		}()
-		once.Do(ctx, func() (interface{}, error) {
+		once.Do(ctx, func() (any, error) {
 			panic("foo")
 		})
 	}()
 
-	first, result, err := once.Do(ctx, func() (interface{}, error) {
+	first, result, err := once.Do(ctx, func() (any, error) {
 		return "bar", io.EOF
 	})
 	if wantFirst := true; first != wantFirst {
@@ -197,7 +197,7 @@ func TestOnceOrRetry_Do(t *testing.T) {
 	var once OnceOrRetry
 	var count atomic.Int32
 	var wg sync.WaitGroup
-	for i := 0; i < 100; i++ {
+	for range 100 {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
@@ -222,7 +222,7 @@ func TestOnceOrRetry_Do_Fail(t *testing.T) {
 	var wg sync.WaitGroup
 
 	// test failure
-	for i := 0; i < 100; i++ {
+	for i := range 100 {
 		wg.Add(1)
 		go func(wantErr error) {
 			defer wg.Done()
diff --git a/registry/remote/auth/cache.go b/registry/remote/auth/cache.go
@@ -109,7 +109,7 @@ func (cc *concurrentCache) Set(ctx context.Context, registry string, scheme Sche
 	}, " ")
 	statusValue, _ := cc.status.LoadOrStore(statusKey, syncutil.NewOnce())
 	fetchOnce := statusValue.(*syncutil.Once)
-	fetchedFirst, result, err := fetchOnce.Do(ctx, func() (interface{}, error) {
+	fetchedFirst, result, err := fetchOnce.Do(ctx, func() (any, error) {
 		return fetch(ctx)
 	})
 	if fetchedFirst {
diff --git a/registry/remote/auth/cache_test.go b/registry/remote/auth/cache_test.go
@@ -273,8 +273,8 @@ func Test_concurrentCache_Set(t *testing.T) {
 		}
 	}
 	var wg sync.WaitGroup
-	for i := 0; i < 10; i++ {
-		for j := 0; j < count; j++ {
+	for range 10 {
+		for j := range count {
 			wg.Add(1)
 			go func(i int) {
 				defer wg.Done()
@@ -292,7 +292,7 @@ func Test_concurrentCache_Set(t *testing.T) {
 	}
 	wg.Wait()
 
-	for i := 0; i < count; i++ {
+	for i := range count {
 		registry := registries[i&1]
 		key := keys[(i>>1)&1]
 
@@ -319,8 +319,8 @@ func Test_concurrentCache_Set(t *testing.T) {
 			return strconv.Itoa(i) + " repeated", nil
 		}
 	}
-	for i := 0; i < 10; i++ {
-		for j := 0; j < count; j++ {
+	for range 10 {
+		for j := range count {
 			wg.Add(1)
 			go func(i int) {
 				defer wg.Done()
@@ -338,7 +338,7 @@ func Test_concurrentCache_Set(t *testing.T) {
 	}
 	wg.Wait()
 
-	for i := 0; i < count; i++ {
+	for i := range count {
 		registry := registries[i&1]
 		key := keys[(i>>1)&1]
 
@@ -387,8 +387,8 @@ func Test_concurrentCache_Set_Fetch_Once(t *testing.T) {
 
 	// first round of fetch
 	var wg sync.WaitGroup
-	for i := 0; i < 10; i++ {
-		for j := 0; j < len(count); j++ {
+	for range 10 {
+		for j := range count {
 			wg.Add(1)
 			go func(i int) {
 				defer wg.Done()
@@ -407,15 +407,15 @@ func Test_concurrentCache_Set_Fetch_Once(t *testing.T) {
 	}
 	wg.Wait()
 
-	for i := 0; i < len(count); i++ {
+	for i := range count {
 		if got := count[i]; got != 1 {
 			t.Errorf("fetch is called more than once: %d", got)
 		}
 	}
 
 	// repeated fetch
-	for i := 0; i < 10; i++ {
-		for j := 0; j < len(count); j++ {
+	for range 10 {
+		for j := range count {
 			wg.Add(1)
 			go func(i int) {
 				defer wg.Done()
@@ -434,7 +434,7 @@ func Test_concurrentCache_Set_Fetch_Once(t *testing.T) {
 	}
 	wg.Wait()
 
-	for i := 0; i < len(count); i++ {
+	for i := range count {
 		if got := count[i]; got != 2 {
 			t.Errorf("fetch is called more than once: %d", got)
 		}
@@ -463,8 +463,8 @@ func Test_concurrentCache_Set_Fetch_Failure(t *testing.T) {
 		}
 	}
 	var wg sync.WaitGroup
-	for i := 0; i < 10; i++ {
-		for j := 0; j < count; j++ {
+	for range 10 {
+		for j := range count {
 			wg.Add(1)
 			go func(i int) {
 				defer wg.Done()
@@ -479,7 +479,7 @@ func Test_concurrentCache_Set_Fetch_Failure(t *testing.T) {
 	}
 	wg.Wait()
 
-	for i := 0; i < count; i++ {
+	for i := range count {
 		registry := registries[i&1]
 		key := keys[(i>>1)&1]
 
@@ -500,8 +500,8 @@ func Test_concurrentCache_Set_Fetch_Failure(t *testing.T) {
 			return strconv.Itoa(i), nil
 		}
 	}
-	for i := 0; i < 10; i++ {
-		for j := 0; j < count; j++ {
+	for range 10 {
+		for j := range count {
 			wg.Add(1)
 			go func(i int) {
 				defer wg.Done()
@@ -519,7 +519,7 @@ func Test_concurrentCache_Set_Fetch_Failure(t *testing.T) {
 	}
 	wg.Wait()
 
-	for i := 0; i < count; i++ {
+	for i := range count {
 		registry := registries[i&1]
 		key := keys[(i>>1)&1]
 
diff --git a/registry/remote/credentials/native_store_test.go b/registry/remote/credentials/native_store_test.go
@@ -131,7 +131,7 @@ func (e *testExecuter) Execute(ctx context.Context, input io.Reader, action stri
 }
 
 func TestNativeStore_interface(t *testing.T) {
-	var ns interface{} = &nativeStore{}
+	var ns any = &nativeStore{}
 	if _, ok := ns.(Store); !ok {
 		t.Error("&NativeStore{} does not conform Store")
 	}
diff --git a/registry/remote/interface_test.go b/registry/remote/interface_test.go
@@ -25,7 +25,7 @@ import (
 )
 
 func TestRepositoryInterface(t *testing.T) {
-	var repo interface{} = &remote.Repository{}
+	var repo any = &remote.Repository{}
 	if _, ok := repo.(registry.Repository); !ok {
 		t.Error("&Repository{} does not conform registry.Repository")
 	}
diff --git a/registry/remote/manifest.go b/registry/remote/manifest.go
diff --git a/registry/remote/registry_test.go b/registry/remote/registry_test.go
diff --git a/registry/remote/repository_test.go b/registry/remote/repository_test.go

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ import (`
`40`	`40`	`)`
`41`	`41`
`42`	`42`	`func TestStoreInterface(t *testing.T) {`
`43`		`- var store interface{} = &Store{}`
	`43`	`+ var store any = &Store{}`
`44`	`44`	`if _, ok := store.(oras.Target); !ok {`
`45`	`45`	`t.Error("&Store{} does not conform oras.Target")`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ func (t *storageTracker) Exists(ctx context.Context, target ocispec.Descriptor)`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`func TestStoreInterface(t *testing.T) {`
`73`		`- var store interface{} = &Store{}`
	`73`	`+ var store any = &Store{}`
`74`	`74`	`if _, ok := store.(oras.GraphTarget); !ok {`
`75`	`75`	`t.Error("&Store{} does not conform oras.Target")`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ import (`
`42`	`42`	`)`
`43`	`43`
`44`	`44`	`func TestReadonlyStoreInterface(t *testing.T) {`
`45`		`- var store interface{} = &ReadOnlyStore{}`
	`45`	`+ var store any = &ReadOnlyStore{}`
`46`	`46`	`if _, ok := store.(oras.ReadOnlyGraphTarget); !ok {`
`47`	`47`	`t.Error("&ReadOnlyStore{} does not conform oras.ReadOnlyGraphTarget")`
`48`	`48`	`}`