Merge pull request #613 from vshn/fix/forgejo-oauth2

Expose oauth2 client configuration for forgejo

Author: github-actions[bot]

apis/vshn/v1/dbaas_vshn_forgejo.go

@@ -127,6 +127,12 @@ type VSHNForgejoConfig struct {
 	// https://forgejo.org/docs/latest/admin/config-cheat-sheet/#openid-openid
 	OpenID map[string]string `json:"openid,omitempty"`
 
+	// https://forgejo.org/docs/latest/admin/config-cheat-sheet/#oauth2-oauth2
+	OAuth2 map[string]string `json:"oauth2,omitempty"`
+
+	// https://forgejo.org/docs/latest/admin/config-cheat-sheet/#oauth2-client-oauth2_client
+	OAuth2Client map[string]string `json:"oauth2_client,omitempty"`
+
 	// https://forgejo.org/docs/latest/admin/config-cheat-sheet/#service-service
 	Service map[string]string `json:"service,omitempty"`
 

apis/vshn/v1/zz_generated.deepcopy.go

@@ -4642,6 +4642,16 @@ spec:
                                     type: string
                                   description: https://forgejo.org/docs/latest/admin/config-cheat-sheet/#mailer-mailer
                                   type: object
+                                oauth2:
+                                  additionalProperties:
+                                    type: string
+                                  description: https://forgejo.org/docs/latest/admin/config-cheat-sheet/#oauth2-oauth2
+                                  type: object
+                                oauth2_client:
+                                  additionalProperties:
+                                    type: string
+                                  description: https://forgejo.org/docs/latest/admin/config-cheat-sheet/#oauth2-client-oauth2_client
+                                  type: object
                                 openid:
                                   additionalProperties:
                                     type: string

crds/vshn.appcat.vshn.io_vshnforgejoes.yaml

@@ -5368,6 +5368,16 @@ spec:
                                   type: string
                                 description: https://forgejo.org/docs/latest/admin/config-cheat-sheet/#mailer-mailer
                                 type: object
+                              oauth2:
+                                additionalProperties:
+                                  type: string
+                                description: https://forgejo.org/docs/latest/admin/config-cheat-sheet/#oauth2-oauth2
+                                type: object
+                              oauth2_client:
+                                additionalProperties:
+                                  type: string
+                                description: https://forgejo.org/docs/latest/admin/config-cheat-sheet/#oauth2-client-oauth2_client
+                                type: object
                               openid:
                                 additionalProperties:
                                   type: string

crds/vshn.appcat.vshn.io_xvshnforgejoes.yaml

@@ -49,6 +49,19 @@ func TestDeployment(t *testing.T) {
 		assert.Equal(t, appName, values["gitea"].(map[string]any)["config"].(map[string]any)["APP_NAME"])
 	})
 
+	t.Run("GivenOAuth2ClientSettings_ExpectInHelmValues", func(t *testing.T) {
+		svc, comp, secretName := bootstrapTest(t)
+		assert.NoError(t, addForgejo(context.TODO(), svc, comp, secretName))
+
+		release := &xhelmv1.Release{}
+		assert.NoError(t, svc.GetDesiredComposedResourceByName(release, comp.GetName()))
+
+		values := getReleaseValues(t, *release)
+		config := values["gitea"].(map[string]any)["config"].(map[string]any)
+		assert.Equal(t, map[string]any{"ENABLE_AUTO_REGISTRATION": "true"}, config["oauth2_client"])
+		assert.Equal(t, map[string]any{"ENABLE": "true"}, config["oauth2"])
+	})
+
 	t.Run("GivenPlan_ExpectPlanResources", func(t *testing.T) {
 		const (
 			plan = "small"

pkg/comp-functions/functions/vshnforgejo/deploy_test.go

@@ -39,6 +39,10 @@ observed:
                   ENABLED: "true"
                 openid:
                   ENABLE_OPENID_SIGNIN: "false"
+                oauth2:
+                  ENABLE: "true"
+                oauth2_client:
+                  ENABLE_AUTO_REGISTRATION: "true"
                 service:
                   REGISTER_EMAIL_CONFIRM: "true"
                 mailer: