Merge branch 'kaessert:main' into master

README.md

@@ -7,9 +7,10 @@ The project is in a prototyping phase but it's already functional and
 implements follwing objects with partial functionality:
 
 * Organization
-  * actions enabled repositories 
+  * actions enabled repositories
+  * actions and dependabot secrets repository access
   * description
-  * creation and deleteion not supported
+  * creation and deletion not supported
 * Team
   * visibility
   * description

apis/organizations/v1alpha1/organization_types.go

@@ -44,10 +44,46 @@ type ActionEnabledRepo struct {
 	RepoSelector *xpv1.Selector `json:"repoSelector,omitempty"`
 }
 
+type SecretSelectedRepo struct {
+	// Name of the repository
+	// +crossplane:generate:reference:type=Repository
+	Repo string `json:"repo,omitempty"`
+
+	// RepoRef is a reference to the Repositories
+	// +optional
+	RepoRef *xpv1.Reference `json:"repoRef,omitempty"`
+
+	// RepoSelector selects a reference to a Repository
+	// +optional
+	RepoSelector *xpv1.Selector `json:"repoSelector,omitempty"`
+}
+
+type OrgSecret struct {
+	// Name of the GitHub secret
+	Name string `json:"name"`
+
+	// List of repositories that have access to the secret.
+	RepositoryAccessList []SecretSelectedRepo `json:"repositoryAccessList,omitempty"`
+}
+
+type SecretConfiguration struct {
+	// List of GitHub Actions secrets
+	// +optional
+	ActionsSecrets []OrgSecret `json:"actionsSecrets,omitempty"`
+
+	// List of Dependabot secrets
+	// +optional
+	DependabotSecrets []OrgSecret `json:"dependabotSecrets,omitempty"`
+}
+
 // OrganizationParameters are the configurable fields of a Organization.
 type OrganizationParameters struct {
 	Description string               `json:"description"`
 	Actions     ActionsConfiguration `json:"actions,omitempty"`
+
+	// Configuration for Organization Secrets.
+	// +optional
+	Secrets *SecretConfiguration `json:"secrets,omitempty"`
 }
 
 // OrganizationObservation are the observable fields of a Organization.

examples/organizations/organization.yaml

@@ -6,3 +6,12 @@ spec:
   deletionPolicy: "Orphan"
   forProvider:
     description: this is a sample organization
+    secrets:
+      actionsSecrets:
+        - name: foo-secret
+          repositoryAccessList:
+            - repo: my-awesome-repo
+      dependabotSecrets:
+        - name: dependabot-token
+          repositoryAccessList:
+            - repo: my-awesome-repo

internal/clients/client.go

@@ -29,6 +29,7 @@ import (
 
 type Client struct {
 	Actions       ActionsClient
+	Dependabot    DependabotClient
 	Organizations OrganizationsClient
 	Users         UsersClient
 	Teams         TeamsClient
@@ -39,6 +40,15 @@ type ActionsClient interface {
 	ListEnabledReposInOrg(ctx context.Context, owner string, opts *github.ListOptions) (*github.ActionsEnabledOnOrgRepos, *github.Response, error)
 	AddEnabledReposInOrg(ctx context.Context, owner string, repositoryID int64) (*github.Response, error)
 	RemoveEnabledReposInOrg(ctx context.Context, owner string, repositoryID int64) (*github.Response, error)
+	GetOrgSecret(ctx context.Context, org, name string) (*github.Secret, *github.Response, error)
+	ListSelectedReposForOrgSecret(ctx context.Context, org, name string, opts *github.ListOptions) (*github.SelectedReposList, *github.Response, error)
+	SetSelectedReposForOrgSecret(ctx context.Context, org, name string, ids github.SelectedRepoIDs) (*github.Response, error)
+}
+
+type DependabotClient interface {
+	GetOrgSecret(ctx context.Context, org, name string) (*github.Secret, *github.Response, error)
+	ListSelectedReposForOrgSecret(ctx context.Context, org, name string, opts *github.ListOptions) (*github.SelectedReposList, *github.Response, error)
+	SetSelectedReposForOrgSecret(ctx context.Context, org, name string, ids github.DependabotSecretsSelectedRepoIDs) (*github.Response, error)
 }
 
 type OrganizationsClient interface {
@@ -123,6 +133,7 @@ func NewClient(creds string) (*Client, error) {
 
 	return &Client{
 		Actions:       ghclient.Actions,
+		Dependabot:    ghclient.Dependabot,
 		Organizations: ghclient.Organizations,
 		Users:         ghclient.Users,
 		Teams:         ghclient.Teams,

internal/clients/fake/client.go

@@ -8,9 +8,12 @@ import (
 )
 
 type MockActionsClient struct {
-	MockListEnabledReposInOrg   func(ctx context.Context, owner string, opts *github.ListOptions) (*github.ActionsEnabledOnOrgRepos, *github.Response, error)
-	MockAddEnabledReposInOrg    func(ctx context.Context, owner string, repositoryID int64) (*github.Response, error)
-	MockRemoveEnabledReposInOrg func(ctx context.Context, owner string, repositoryID int64) (*github.Response, error)
+	MockListEnabledReposInOrg         func(ctx context.Context, owner string, opts *github.ListOptions) (*github.ActionsEnabledOnOrgRepos, *github.Response, error)
+	MockAddEnabledReposInOrg          func(ctx context.Context, owner string, repositoryID int64) (*github.Response, error)
+	MockRemoveEnabledReposInOrg       func(ctx context.Context, owner string, repositoryID int64) (*github.Response, error)
+	MockGetOrgSecret                  func(ctx context.Context, org, name string) (*github.Secret, *github.Response, error)
+	MockListSelectedReposForOrgSecret func(ctx context.Context, org, name string, opts *github.ListOptions) (*github.SelectedReposList, *github.Response, error)
+	MockSetSelectedReposForOrgSecret  func(ctx context.Context, org, name string, ids github.SelectedRepoIDs) (*github.Response, error)
 }
 
 func (m *MockActionsClient) ListEnabledReposInOrg(ctx context.Context, owner string, opts *github.ListOptions) (*github.ActionsEnabledOnOrgRepos, *github.Response, error) {
@@ -25,6 +28,36 @@ func (m *MockActionsClient) RemoveEnabledReposInOrg(ctx context.Context, owner s
 	return m.MockRemoveEnabledReposInOrg(ctx, owner, repositoryID)
 }
 
+func (m *MockActionsClient) GetOrgSecret(ctx context.Context, org, name string) (*github.Secret, *github.Response, error) {
+	return m.MockGetOrgSecret(ctx, org, name)
+}
+
+func (m *MockActionsClient) ListSelectedReposForOrgSecret(ctx context.Context, org, name string, opts *github.ListOptions) (*github.SelectedReposList, *github.Response, error) {
+	return m.MockListSelectedReposForOrgSecret(ctx, org, name, opts)
+}
+
+func (m *MockActionsClient) SetSelectedReposForOrgSecret(ctx context.Context, org, name string, ids github.SelectedRepoIDs) (*github.Response, error) {
+	return m.MockSetSelectedReposForOrgSecret(ctx, org, name, ids)
+}
+
+type MockDependabotClient struct {
+	MockGetOrgSecret                  func(ctx context.Context, org, name string) (*github.Secret, *github.Response, error)
+	MockListSelectedReposForOrgSecret func(ctx context.Context, org, name string, opts *github.ListOptions) (*github.SelectedReposList, *github.Response, error)
+	MockSetSelectedReposForOrgSecret  func(ctx context.Context, org, name string, ids github.DependabotSecretsSelectedRepoIDs) (*github.Response, error)
+}
+
+func (m *MockDependabotClient) GetOrgSecret(ctx context.Context, org, name string) (*github.Secret, *github.Response, error) {
+	return m.MockGetOrgSecret(ctx, org, name)
+}
+
+func (m *MockDependabotClient) ListSelectedReposForOrgSecret(ctx context.Context, org, name string, opts *github.ListOptions) (*github.SelectedReposList, *github.Response, error) {
+	return m.MockListSelectedReposForOrgSecret(ctx, org, name, opts)
+}
+
+func (m *MockDependabotClient) SetSelectedReposForOrgSecret(ctx context.Context, org, name string, ids github.DependabotSecretsSelectedRepoIDs) (*github.Response, error) {
+	return m.MockSetSelectedReposForOrgSecret(ctx, org, name, ids)
+}
+
 type MockOrganizationsClient struct {
 	MockGet                 func(ctx context.Context, org string) (*github.Organization, *github.Response, error)
 	MockEdit                func(ctx context.Context, name string, org *github.Organization) (*github.Organization, *github.Response, error)