Marshal GitHub connector config with JSON annotations

pkg/idp/provider/github/github.go

@@ -2,6 +2,7 @@ package github
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"net/http"
 	"strconv"
@@ -11,14 +12,14 @@ import (
 	"github.com/giantswarm/dex-operator/pkg/idp/provider"
 	"github.com/giantswarm/dex-operator/pkg/idp/provider/github/manifest"
 	"github.com/giantswarm/dex-operator/pkg/key"
+	"github.com/giantswarm/dex-operator/pkg/yaml"
 
 	"github.com/bradleyfalzon/ghinstallation/v2"
 	githubconnector "github.com/dexidp/dex/connector/github"
 	"github.com/giantswarm/microerror"
 	"github.com/go-logr/logr"
 	githubclient "github.com/google/go-github/v50/github"
 	"github.com/skratchdot/open-golang/open"
-	"gopkg.in/yaml.v2"
 )
 
 const (
@@ -178,7 +179,7 @@ func (g *Github) CreateOrUpdateApp(config provider.AppConfig, ctx context.Contex
 		RedirectURI:   config.RedirectURI,
 		TeamNameField: TeamNameFieldSlug,
 	}
-	data, err := yaml.Marshal(connectorConfig)
+	data, err := yaml.MarshalWithJsonAnnotations(connectorConfig)
 	if err != nil {
 		return provider.ProviderApp{}, microerror.Mask(err)
 	}

pkg/yaml/yaml.go

@@ -0,0 +1,24 @@
+package yaml
+
+import (
+	"encoding/json"
+
+	"github.com/giantswarm/microerror"
+	yamllib "gopkg.in/yaml.v2"
+)
+
+// MarshalWithJsonAnnotations marshals the given value to YAML, but uses the
+// JSON annotations of the struct fields.
+func MarshalWithJsonAnnotations(v any) ([]byte, error) {
+	jsonData, jsonErr := json.Marshal(v)
+	if jsonErr != nil {
+		return nil, microerror.Mask(jsonErr)
+	}
+	var mapData map[string]interface{}
+	jsonErr = json.Unmarshal(jsonData, &mapData)
+	if jsonErr != nil {
+		return nil, microerror.Mask(jsonErr)
+	}
+	data, yamlErr := yamllib.Marshal(mapData)
+	return data, yamlErr
+}