Fix Mapstructure problem on event integrations

Author: rocktavious

src/cmd/integration.go

@@ -26,6 +26,11 @@ var AllIntegrationType = []IntegrationType{IntegrationTypeAWS, IntegrationTypeAz
 
 var IntegrationConfigCurrentVersion = "1"
 
+type EventIntegrationInputDTO struct {
+	Name string                        `json:"name,omitempty" yaml:"name,omitempty"`
+	Type opslevel.EventIntegrationEnum `json:"type" yaml:"type" example:"apiDoc"`
+}
+
 type IntegrationInputType struct {
 	Version string `yaml:"version"`
 	Kind    IntegrationType
@@ -34,9 +39,9 @@ type IntegrationInputType struct {
 
 type IntegrationInput interface {
 	opslevel.AWSIntegrationInput |
-		opslevel.AzureResourcesIntegrationInput |
-		opslevel.EventIntegrationInput |
-		opslevel.GoogleCloudIntegrationInput
+	opslevel.AzureResourcesIntegrationInput |
+	EventIntegrationInputDTO |
+	opslevel.GoogleCloudIntegrationInput
 }
 
 func validateIntegrationInput() (*IntegrationInputType, error) {
@@ -124,12 +129,11 @@ EOF
 		var result *opslevel.Integration
 		if slices.Contains(opslevel.AllEventIntegrationEnum, string(input.Kind)) {
 			input.Spec["type"] = input.Kind
-			eventIntegrationInput, err := readIntegrationInput[opslevel.EventIntegrationInput](input)
-			integrationTypeEnum := opslevel.EventIntegrationEnum(eventIntegrationInput.Type)
+			eventIntegrationInput, err := readIntegrationInput[EventIntegrationInputDTO](input)
 			cobra.CheckErr(err)
 			result, err = getClientGQL().CreateEventIntegration(opslevel.EventIntegrationInput{
-				Name: eventIntegrationInput.Name,
-				Type: integrationTypeEnum,
+				Name: opslevel.NewNullableFrom(eventIntegrationInput.Name),
+				Type: eventIntegrationInput.Type,
 			})
 			cobra.CheckErr(err)
 		} else {
@@ -246,15 +250,17 @@ EOF
 		var result *opslevel.Integration
 		if slices.Contains(opslevel.AllEventIntegrationEnum, string(input.Kind)) {
 			input.Spec["type"] = input.Kind
-			eventIntegrationInput, err := readIntegrationInput[opslevel.EventIntegrationInput](input)
+			eventIntegrationInput, err := readIntegrationInput[EventIntegrationInputDTO](input)
 			cobra.CheckErr(err)
-			if eventIntegrationInput.Name != nil {
+			if eventIntegrationInput.Name != "" {
 				apiInput := opslevel.EventIntegrationUpdateInput{
 					Id:   opslevel.ID(args[0]),
-					Name: eventIntegrationInput.Name.Value,
+					Name: eventIntegrationInput.Name,
 				}
 				result, err = getClientGQL().UpdateEventIntegration(apiInput)
+
 				cobra.CheckErr(err)
+
 			} else {
 				log.Warn().Msgf("event integration 'name' cannot be updated as no name field was provided")
 				return