feat!: Add OIDC authentication support to PrivateRegistries

github/private_registries_test.go

@@ -22,6 +22,7 @@ func TestPrivateRegistriesService_ListOrganizationPrivateRegistries(t *testing.T
 
 	mux.HandleFunc("/orgs/o/private-registries", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, "GET")
+		testHeader(t, r, "X-Github-Api-Version", "2026-03-10")
 		testFormValues(t, r, values{
 			"page": "2",
 		})
@@ -52,7 +53,7 @@ func TestPrivateRegistriesService_ListOrganizationPrivateRegistries(t *testing.T
 		Configurations: []*PrivateRegistry{
 			{
 				Name:         Ptr("MAVEN_REPOSITORY_SECRET"),
-				RegistryType: Ptr("maven_repository"),
+				RegistryType: Ptr(PrivateRegistryTypeMavenRepository),
 				Username:     Ptr("monalisa"),
 				CreatedAt:    &Timestamp{time.Date(2019, time.August, 10, 14, 59, 22, 0, time.UTC)},
 				UpdatedAt:    &Timestamp{time.Date(2020, time.January, 10, 14, 59, 22, 0, time.UTC)},
@@ -90,11 +91,11 @@ func TestPrivateRegistriesService_CreateOrganizationPrivateRegistry(t *testing.T
 	client, mux, _ := setup(t)
 
 	input := &CreateOrganizationPrivateRegistry{
-		RegistryType:          "maven_repository",
-		URL:                   "https://maven.pkg.github.com/OWNER/REPOSITORY",
+		RegistryType:          PrivateRegistryTypeMavenRepository,
+		URL:                   "https://example.com/OWNER/REPOSITORY",
 		Username:              Ptr("monalisa"),
-		EncryptedValue:        "encrypted_value",
-		KeyID:                 "key_id",
+		EncryptedValue:        Ptr("encrypted_value"),
+		KeyID:                 Ptr("key_id"),
 		Visibility:            PrivateRegistryVisibilitySelected,
 		SelectedRepositoryIDs: []int64{1, 2, 3},
 	}
@@ -104,17 +105,20 @@ func TestPrivateRegistriesService_CreateOrganizationPrivateRegistry(t *testing.T
 		assertNilError(t, json.NewDecoder(r.Body).Decode(&v))
 
 		testMethod(t, r, "POST")
+		testHeader(t, r, "X-Github-Api-Version", "2026-03-10")
 		if !cmp.Equal(v, input) {
 			t.Errorf("Request body = %+v, want %+v", v, input)
 		}
 
+		w.WriteHeader(http.StatusCreated)
 		fmt.Fprint(w, `{
   "name": "MAVEN_REPOSITORY_SECRET",
   "registry_type": "maven_repository",
   "username": "monalisa",
+  "visibility": "selected",
+  "selected_repository_ids": [1, 2, 3],
   "created_at": "2019-08-10T14:59:22Z",
-  "updated_at": "2020-01-10T14:59:22Z",
-  "visibility": "selected"
+  "updated_at": "2020-01-10T14:59:22Z"
 }`)
 	})
 
@@ -125,12 +129,13 @@ func TestPrivateRegistriesService_CreateOrganizationPrivateRegistry(t *testing.T
 	}
 
 	want := &PrivateRegistry{
-		Name:         Ptr("MAVEN_REPOSITORY_SECRET"),
-		RegistryType: Ptr("maven_repository"),
-		Username:     Ptr("monalisa"),
-		CreatedAt:    &Timestamp{time.Date(2019, time.August, 10, 14, 59, 22, 0, time.UTC)},
-		UpdatedAt:    &Timestamp{time.Date(2020, time.January, 10, 14, 59, 22, 0, time.UTC)},
-		Visibility:   Ptr(PrivateRegistryVisibilitySelected),
+		Name:                  Ptr("MAVEN_REPOSITORY_SECRET"),
+		RegistryType:          Ptr(PrivateRegistryTypeMavenRepository),
+		Username:              Ptr("monalisa"),
+		CreatedAt:             &Timestamp{time.Date(2019, time.August, 10, 14, 59, 22, 0, time.UTC)},
+		UpdatedAt:             &Timestamp{time.Date(2020, time.January, 10, 14, 59, 22, 0, time.UTC)},
+		Visibility:            Ptr(PrivateRegistryVisibilitySelected),
+		SelectedRepositoryIDs: []int64{1, 2, 3},
 	}
 	if diff := cmp.Diff(want, privateRegistry); diff != "" {
 		t.Errorf("PrivateRegistries.CreateOrganizationPrivateRegistries mismatch (-want +got):\\n%v", diff)
@@ -151,12 +156,155 @@ func TestPrivateRegistriesService_CreateOrganizationPrivateRegistry(t *testing.T
 	})
 }
 
+func TestPrivateRegistriesService_CreateOrganizationPrivateRegistry_OIDC(t *testing.T) {
+	t.Parallel()
+	client, mux, _ := setup(t)
+
+	input := &CreateOrganizationPrivateRegistry{
+		RegistryType:          PrivateRegistryTypeMavenRepository,
+		URL:                   "https://example.com/maven",
+		AuthType:              Ptr("oidc_azure"),
+		TenantID:              Ptr("my-tenant-id"),
+		ClientID:              Ptr("my-client-id"),
+		ReplacesBase:          Ptr(true),
+		Visibility:            PrivateRegistryVisibilitySelected,
+		SelectedRepositoryIDs: []int64{1, 2, 3},
+	}
+
+	mux.HandleFunc("/orgs/o/private-registries", func(w http.ResponseWriter, r *http.Request) {
+		var v *CreateOrganizationPrivateRegistry
+		assertNilError(t, json.NewDecoder(r.Body).Decode(&v))
+
+		testMethod(t, r, "POST")
+		testHeader(t, r, "X-Github-Api-Version", "2026-03-10")
+		if !cmp.Equal(v, input) {
+			t.Errorf("Request body = %+v, want %+v", v, input)
+		}
+
+		w.WriteHeader(http.StatusCreated)
+		fmt.Fprint(w, `{
+  "name": "MAVEN_REPOSITORY_SECRET",
+  "registry_type": "maven_repository",
+  "visibility": "selected",
+  "selected_repository_ids": [1, 2, 3],
+  "created_at": "2019-08-10T14:59:22Z",
+  "updated_at": "2020-01-10T14:59:22Z"
+}`)
+	})
+
+	ctx := t.Context()
+	privateRegistry, _, err := client.PrivateRegistries.CreateOrganizationPrivateRegistry(ctx, "o", *input)
+	if err != nil {
+		t.Fatalf("PrivateRegistries.CreateOrganizationPrivateRegistry (OIDC) returned error: %v", err)
+	}
+
+	want := &PrivateRegistry{
+		Name:                  Ptr("MAVEN_REPOSITORY_SECRET"),
+		RegistryType:          Ptr(PrivateRegistryTypeMavenRepository),
+		CreatedAt:             &Timestamp{time.Date(2019, time.August, 10, 14, 59, 22, 0, time.UTC)},
+		UpdatedAt:             &Timestamp{time.Date(2020, time.January, 10, 14, 59, 22, 0, time.UTC)},
+		Visibility:            Ptr(PrivateRegistryVisibilitySelected),
+		SelectedRepositoryIDs: []int64{1, 2, 3},
+	}
+	if diff := cmp.Diff(want, privateRegistry); diff != "" {
+		t.Errorf("PrivateRegistries.CreateOrganizationPrivateRegistry (OIDC) mismatch (-want +got):\\n%v", diff)
+	}
+}
+
+func TestPrivateRegistries_UpdateOrganizationPrivateRegistry_OIDC(t *testing.T) {
+	t.Parallel()
+	client, mux, _ := setup(t)
+
+	input := &UpdateOrganizationPrivateRegistry{
+		AuthType:    Ptr("oidc_aws"),
+		AWSRegion:   Ptr("us-east-1"),
+		AccountID:   Ptr("123456789012"),
+		RoleName:    Ptr("my-role"),
+		Domain:      Ptr("my-domain"),
+		DomainOwner: Ptr("123456789012"),
+		Audience:    Ptr("example.com"),
+		Visibility:  Ptr(PrivateRegistryVisibilitySelected),
+	}
+
+	mux.HandleFunc("/orgs/o/private-registries/AWS_REGISTRY_SECRET", func(w http.ResponseWriter, r *http.Request) {
+		var v *UpdateOrganizationPrivateRegistry
+		assertNilError(t, json.NewDecoder(r.Body).Decode(&v))
+
+		testMethod(t, r, "PATCH")
+		testHeader(t, r, "X-Github-Api-Version", "2026-03-10")
+		if !cmp.Equal(v, input) {
+			t.Errorf("Request body = %+v, want %+v", v, input)
+		}
+
+		w.WriteHeader(http.StatusNoContent)
+	})
+
+	ctx := t.Context()
+	_, err := client.PrivateRegistries.UpdateOrganizationPrivateRegistry(ctx, "o", "AWS_REGISTRY_SECRET", *input)
+	if err != nil {
+		t.Fatalf("PrivateRegistries.UpdateOrganizationPrivateRegistry (OIDC) returned error: %v", err)
+	}
+}
+
+func TestPrivateRegistriesService_CreateOrganizationPrivateRegistry_OIDCJFrog(t *testing.T) {
+	t.Parallel()
+	client, mux, _ := setup(t)
+
+	input := &CreateOrganizationPrivateRegistry{
+		RegistryType:          PrivateRegistryTypeNpmRegistry,
+		URL:                   "https://example.com/npm",
+		AuthType:              Ptr("oidc_jfrog"),
+		JFrogOIDCProviderName: Ptr("my-jfrog-provider"),
+		Audience:              Ptr("jfrog"),
+		IdentityMappingName:   Ptr("my-identity-mapping"),
+		Visibility:            PrivateRegistryVisibilityPrivate,
+	}
+
+	mux.HandleFunc("/orgs/o/private-registries", func(w http.ResponseWriter, r *http.Request) {
+		var v *CreateOrganizationPrivateRegistry
+		assertNilError(t, json.NewDecoder(r.Body).Decode(&v))
+
+		testMethod(t, r, "POST")
+		testHeader(t, r, "X-Github-Api-Version", "2026-03-10")
+		if !cmp.Equal(v, input) {
+			t.Errorf("Request body = %+v, want %+v", v, input)
+		}
+
+		w.WriteHeader(http.StatusCreated)
+		fmt.Fprint(w, `{
+  "name": "NPM_REGISTRY_SECRET",
+  "registry_type": "npm_registry",
+  "visibility": "private",
+  "created_at": "2019-08-10T14:59:22Z",
+  "updated_at": "2020-01-10T14:59:22Z"
+}`)
+	})
+
+	ctx := t.Context()
+	privateRegistry, _, err := client.PrivateRegistries.CreateOrganizationPrivateRegistry(ctx, "o", *input)
+	if err != nil {
+		t.Fatalf("PrivateRegistries.CreateOrganizationPrivateRegistry (OIDC JFrog) returned error: %v", err)
+	}
+
+	want := &PrivateRegistry{
+		Name:         Ptr("NPM_REGISTRY_SECRET"),
+		RegistryType: Ptr(PrivateRegistryTypeNpmRegistry),
+		CreatedAt:    &Timestamp{time.Date(2019, time.August, 10, 14, 59, 22, 0, time.UTC)},
+		UpdatedAt:    &Timestamp{time.Date(2020, time.January, 10, 14, 59, 22, 0, time.UTC)},
+		Visibility:   Ptr(PrivateRegistryVisibilityPrivate),
+	}
+	if diff := cmp.Diff(want, privateRegistry); diff != "" {
+		t.Errorf("PrivateRegistries.CreateOrganizationPrivateRegistry (OIDC JFrog) mismatch (-want +got):\\n%v", diff)
+	}
+}
+
 func TestPrivateRegistriesService_GetOrganizationPrivateRegistriesPublicKey(t *testing.T) {
 	t.Parallel()
 	client, mux, _ := setup(t)
 
 	mux.HandleFunc("/orgs/o/private-registries/public-key", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, "GET")
+		testHeader(t, r, "X-Github-Api-Version", "2026-03-10")
 		fmt.Fprint(w, `{
   "key_id": "0123456789",
   "key": "public_key"
@@ -197,6 +345,7 @@ func TestPrivateRegistriesService_GetOrganizationPrivateRegistry(t *testing.T) {
 
 	mux.HandleFunc("/orgs/o/private-registries/MAVEN_REPOSITORY_SECRET", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, "GET")
+		testHeader(t, r, "X-Github-Api-Version", "2026-03-10")
 		fmt.Fprint(w, `{
   "name": "MAVEN_REPOSITORY_SECRET",
   "registry_type": "maven_repository",
@@ -214,7 +363,7 @@ func TestPrivateRegistriesService_GetOrganizationPrivateRegistry(t *testing.T) {
 
 	want := &PrivateRegistry{
 		Name:         Ptr("MAVEN_REPOSITORY_SECRET"),
-		RegistryType: Ptr("maven_repository"),
+		RegistryType: Ptr(PrivateRegistryTypeMavenRepository),
 		Username:     Ptr("monalisa"),
 		CreatedAt:    &Timestamp{time.Date(2019, time.August, 10, 14, 59, 22, 0, time.UTC)},
 		UpdatedAt:    &Timestamp{time.Date(2020, time.January, 10, 14, 59, 22, 0, time.UTC)},
@@ -254,50 +403,28 @@ func TestPrivateRegistries_UpdateOrganizationPrivateRegistry(t *testing.T) {
 		assertNilError(t, json.NewDecoder(r.Body).Decode(&v))
 
 		testMethod(t, r, "PATCH")
+		testHeader(t, r, "X-Github-Api-Version", "2026-03-10")
 		if !cmp.Equal(v, input) {
 			t.Errorf("Request body = %+v, want %+v", v, input)
 		}
 
-		fmt.Fprint(w, `{
-  "name": "MAVEN_REPOSITORY_SECRET",
-  "registry_type": "maven_repository",
-  "username": "monalisa",
-  "created_at": "2019-08-10T14:59:22Z",
-  "updated_at": "2020-01-10T14:59:22Z",
-  "visibility": "selected"
-}`)
+		w.WriteHeader(http.StatusNoContent)
 	})
 
 	ctx := t.Context()
-	privateRegistry, _, err := client.PrivateRegistries.UpdateOrganizationPrivateRegistry(ctx, "o", "MAVEN_REPOSITORY_SECRET", *input)
+	_, err := client.PrivateRegistries.UpdateOrganizationPrivateRegistry(ctx, "o", "MAVEN_REPOSITORY_SECRET", *input)
 	if err != nil {
 		t.Fatalf("PrivateRegistries.UpdateOrganizationPrivateRegistry returned error: %v", err)
 	}
 
-	want := &PrivateRegistry{
-		Name:         Ptr("MAVEN_REPOSITORY_SECRET"),
-		RegistryType: Ptr("maven_repository"),
-		Username:     Ptr("monalisa"),
-		CreatedAt:    &Timestamp{time.Date(2019, time.August, 10, 14, 59, 22, 0, time.UTC)},
-		UpdatedAt:    &Timestamp{time.Date(2020, time.January, 10, 14, 59, 22, 0, time.UTC)},
-		Visibility:   Ptr(PrivateRegistryVisibilitySelected),
-	}
-	if diff := cmp.Diff(want, privateRegistry); diff != "" {
-		t.Errorf("PrivateRegistries.UpdateOrganizationPrivateRegistry mismatch (-want +got):\\n%v", diff)
-	}
-
 	const methodName = "UpdateOrganizationPrivateRegistry"
 	testBadOptions(t, methodName, func() (err error) {
-		_, _, err = client.PrivateRegistries.UpdateOrganizationPrivateRegistry(ctx, "\n", "MAVEN_REPOSITORY_SECRET", *input)
+		_, err = client.PrivateRegistries.UpdateOrganizationPrivateRegistry(ctx, "\n", "MAVEN_REPOSITORY_SECRET", *input)
 		return err
 	})
 
 	testNewRequestAndDoFailure(t, methodName, client, func() (*Response, error) {
-		got, resp, err := client.PrivateRegistries.UpdateOrganizationPrivateRegistry(ctx, "o", "MAVEN_REPOSITORY_SECRET", *input)
-		if got != nil {
-			t.Errorf("testNewRequestAndDoFailure %v = %#v, want nil", methodName, got)
-		}
-		return resp, err
+		return client.PrivateRegistries.UpdateOrganizationPrivateRegistry(ctx, "o", "MAVEN_REPOSITORY_SECRET", *input)
 	})
 }
 
@@ -307,6 +434,7 @@ func TestPrivateRegistriesService_DeleteOrganizationPrivateRegistry(t *testing.T
 
 	mux.HandleFunc("/orgs/o/private-registries/MAVEN_REPOSITORY_SECRET", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, "DELETE")
+		testHeader(t, r, "X-Github-Api-Version", "2026-03-10")
 		w.WriteHeader(http.StatusNoContent)
 	})
 	ctx := t.Context()

openapi_operations.yaml

@@ -13,6 +13,18 @@ operations:
 operation_overrides:
   - name: GET /meta
     documentation_url: https://docs.github.com/rest/meta/meta#get-github-meta-information
+  - name: GET /orgs/{org}/private-registries
+    documentation_url: https://docs.github.com/rest/private-registries/organization-configurations?apiVersion=2026-03-10#list-private-registries-for-an-organization
+  - name: POST /orgs/{org}/private-registries
+    documentation_url: https://docs.github.com/rest/private-registries/organization-configurations?apiVersion=2026-03-10#create-a-private-registry-for-an-organization
+  - name: GET /orgs/{org}/private-registries/public-key
+    documentation_url: https://docs.github.com/rest/private-registries/organization-configurations?apiVersion=2026-03-10#get-private-registries-public-key-for-an-organization
+  - name: DELETE /orgs/{org}/private-registries/{secret_name}
+    documentation_url: https://docs.github.com/rest/private-registries/organization-configurations?apiVersion=2026-03-10#delete-a-private-registry-for-an-organization
+  - name: GET /orgs/{org}/private-registries/{secret_name}
+    documentation_url: https://docs.github.com/rest/private-registries/organization-configurations?apiVersion=2026-03-10#get-a-private-registry-for-an-organization
+  - name: PATCH /orgs/{org}/private-registries/{secret_name}
+    documentation_url: https://docs.github.com/rest/private-registries/organization-configurations?apiVersion=2026-03-10#update-a-private-registry-for-an-organization
   - name: DELETE /repos/{owner}/{repo}/pages
     documentation_url: https://docs.github.com/rest/pages/pages#delete-a-github-pages-site
   - name: GET /repos/{owner}/{repo}/pages

tools/metadata/metadata.go

@@ -502,7 +502,9 @@ func normalizeDocURL(docURL string) string {
 
 	u.Path = cleanPath
 	q := u.Query()
-	q.Set("apiVersion", metadataDocsAPIVersion)
+	if q.Get("apiVersion") == "" {
+		q.Set("apiVersion", metadataDocsAPIVersion)
+	}
 	u.RawQuery = q.Encode()
 	return u.String()
 }

tools/metadata/metadata_test.go

@@ -53,9 +53,14 @@ func Test_normalizeDocURL(t *testing.T) {
 			want:   "https://docs.github.com/rest/repos/repos?apiVersion=2022-11-28&foo=bar",
 		},
 		{
-			name:   "replace existing api version",
+			name:   "preserve existing api version",
 			docURL: "https://docs.github.com/rest/repos/repos?apiVersion=2021-01-01&foo=bar",
-			want:   "https://docs.github.com/rest/repos/repos?apiVersion=2022-11-28&foo=bar",
+			want:   "https://docs.github.com/rest/repos/repos?apiVersion=2021-01-01&foo=bar",
+		},
+		{
+			name:   "preserve non-default api version",
+			docURL: "https://docs.github.com/rest/private-registries/organization-configurations?apiVersion=2026-03-10#list-private-registries-for-an-organization",
+			want:   "https://docs.github.com/rest/private-registries/organization-configurations?apiVersion=2026-03-10#list-private-registries-for-an-organization",
 		},
 		{
 			name:   "enterprise cloud latest rest is normalized",

tools/structfield/structfield.go

@@ -410,7 +410,7 @@ func tagNameToPascal(tagName string) (want, alternate string) {
 
 // Common Go initialisms that should be all caps.
 var initialisms = map[string]bool{
-	"API": true, "ASCII": true,
+	"API": true, "ASCII": true, "AWS": true,
 	"CAA": true, "CAS": true, "CNAME": true, "CPU": true,
 	"CSS": true, "CWE": true, "CVE": true, "CVSS": true,
 	"DN": true, "DNS": true,
@@ -419,6 +419,7 @@ var initialisms = map[string]bool{
 	"HTML": true, "HTTP": true, "HTTPS": true,
 	"ID": true, "IDE": true, "IDP": true, "IP": true, "JIT": true,
 	"JSON": true,
+	"OIDC": true,
 	"LDAP": true, "LFS": true, "LHS": true,
 	"MD5": true, "MS": true, "MX": true,
 	"NPM": true, "NTP": true, "NVD": true,
@@ -440,6 +441,7 @@ var initialisms = map[string]bool{
 var specialCases = map[string]string{
 	"CPUS":    "CPUs",
 	"CWES":    "CWEs",
+	"JFROG":   "JFrog",
 	"GRAPHQL": "GraphQL",
 	"HREF":    "HRef",
 	"IDS":     "IDs",