Port 5363 UI create default resources

main.go

@@ -6,8 +6,6 @@ import (
 	"github.com/port-labs/port-k8s-exporter/pkg/config"
 	"github.com/port-labs/port-k8s-exporter/pkg/defaults"
 	"github.com/port-labs/port-k8s-exporter/pkg/event_handler"
-	"github.com/port-labs/port-k8s-exporter/pkg/event_handler/consumer"
-	"github.com/port-labs/port-k8s-exporter/pkg/event_handler/polling"
 	"github.com/port-labs/port-k8s-exporter/pkg/handlers"
 	"github.com/port-labs/port-k8s-exporter/pkg/k8s"
 	"github.com/port-labs/port-k8s-exporter/pkg/port"
@@ -35,42 +33,11 @@ func initiateHandler(exporterConfig *port.Config, k8sClient *k8s.Client, portCli
 	return newHandler, nil
 }
 
-func createEventListener(stateKey string, eventListenerType string, portClient *cli.PortClient) (event_handler.IListener, error) {
-	klog.Infof("Received event listener type: %s", eventListenerType)
-	switch eventListenerType {
-	case "KAFKA":
-		return consumer.NewEventListener(stateKey, portClient)
-	case "POLLING":
-		return polling.NewEventListener(stateKey, portClient), nil
-	default:
-		return nil, fmt.Errorf("unknown event listener type: %s", eventListenerType)
-	}
-}
-
-func getApplicationConfig() *port.Config {
-	appConfig, err := config.GetConfigFile(config.ApplicationConfig.ConfigFilePath)
-	var fileNotFoundError *config.FileNotFoundError
-	if errors.As(err, &fileNotFoundError) {
-		appConfig = &port.Config{
-			StateKey:               config.ApplicationConfig.StateKey,
-			EventListenerType:      config.ApplicationConfig.EventListenerType,
-			CreateDefaultResources: config.ApplicationConfig.CreateDefaultResources,
-		}
-	}
-
-	if config.ApplicationConfig.ResyncInterval != 0 {
-		appConfig.ResyncInterval = config.ApplicationConfig.ResyncInterval
-	}
-
-	return appConfig
-}
-
 func main() {
 	klog.InitFlags(nil)
 
 	k8sConfig := k8s.NewKubeConfig()
-
-	applicationConfig := getApplicationConfig()
+	applicationConfig := config.NewConfiguration()
 
 	clientConfig, err := k8sConfig.ClientConfig()
 	if err != nil {
@@ -95,7 +62,7 @@ func main() {
 		klog.Fatalf("Error initializing Port integration: %s", err.Error())
 	}
 
-	eventListener, err := createEventListener(applicationConfig.StateKey, applicationConfig.EventListenerType, portClient)
+	eventListener, err := event_handler.CreateEventListener(applicationConfig.StateKey, applicationConfig.EventListenerType, portClient)
 	if err != nil {
 		klog.Fatalf("Error creating event listener: %s", err.Error())
 	}

pkg/config/config.go

@@ -1,8 +1,10 @@
 package config
 
 import (
+	"errors"
 	"flag"
 	"github.com/joho/godotenv"
+	"github.com/port-labs/port-k8s-exporter/pkg/port"
 )
 
 var KafkaConfig = &KafkaConfiguration{}
@@ -12,6 +14,9 @@ var ApplicationConfig = &ApplicationConfiguration{}
 
 func Init() {
 	_ = godotenv.Load()
+
+	NewString(&ApplicationConfig.EventListenerType, "event-listener-type", "POLLING", "Event listener type, can be either POLLING or KAFKA. Optional.")
+
 	// Kafka listener Configuration
 	NewString(&KafkaConfig.Brokers, "event-listener-brokers", "localhost:9092", "Kafka event listener brokers")
 	NewString(&KafkaConfig.SecurityProtocol, "event-listener-security-protocol", "plaintext", "Kafka event listener security protocol")
@@ -27,8 +32,25 @@ func Init() {
 	NewString(&ApplicationConfig.PortBaseURL, "port-base-url", "https://api.getport.io", "Port base URL. Optional.")
 	NewString(&ApplicationConfig.PortClientId, "port-client-id", "", "Port client id. Required.")
 	NewString(&ApplicationConfig.PortClientSecret, "port-client-secret", "", "Port client secret. Required.")
-	NewString(&ApplicationConfig.EventListenerType, "event-listener-type", "POLLING", "Event listener type, can be either POLLING or KAFKA. Optional.")
 	NewBool(&ApplicationConfig.CreateDefaultResources, "create-default-resources", true, "Create default resources on installation. Optional.")
 
 	flag.Parse()
 }
+
+func NewConfiguration() *port.Config {
+	c, err := GetConfigFile(ApplicationConfig.ConfigFilePath)
+	var fileNotFoundError *FileNotFoundError
+	if errors.As(err, &fileNotFoundError) {
+		c = &port.Config{
+			StateKey:               ApplicationConfig.StateKey,
+			EventListenerType:      ApplicationConfig.EventListenerType,
+			CreateDefaultResources: ApplicationConfig.CreateDefaultResources,
+		}
+	}
+
+	if ApplicationConfig.ResyncInterval != 0 {
+		c.ResyncInterval = ApplicationConfig.ResyncInterval
+	}
+
+	return c
+}

pkg/defaults/defaults.go

@@ -26,9 +26,13 @@ type Defaults struct {
 	AppConfig  *port.IntegrationAppConfig
 }
 
+var BlueprintsAsset = "assets/defaults/blueprints.json"
+var ScorecardsAsset = "assets/defaults/scorecards.json"
+var AppConfigAsset = "assets/defaults/appConfig.yaml"
+
 func getDefaults() (*Defaults, error) {
 	var bp []port.Blueprint
-	file, err := os.ReadFile("assets/defaults/blueprints.json")
+	file, err := os.ReadFile(BlueprintsAsset)
 	if err != nil {
 		klog.Infof("No default blueprints found. Skipping...")
 	} else {
@@ -39,7 +43,7 @@ func getDefaults() (*Defaults, error) {
 	}
 
 	var sc []ScorecardDefault
-	file, err = os.ReadFile("./assets/defaults/scorecards.json")
+	file, err = os.ReadFile(ScorecardsAsset)
 	if err != nil {
 		klog.Infof("No default scorecards found. Skipping...")
 	} else {
@@ -50,7 +54,7 @@ func getDefaults() (*Defaults, error) {
 	}
 
 	var appConfig *port.IntegrationAppConfig
-	file, err = os.ReadFile("./assets/defaults/appConfig.yaml")
+	file, err = os.ReadFile(AppConfigAsset)
 	if err != nil {
 		klog.Infof("No default appConfig found. Skipping...")
 	} else {
@@ -67,14 +71,19 @@ func getDefaults() (*Defaults, error) {
 	}, nil
 }
 
+// deconstructBlueprintsToCreationSteps takes a list of blueprints and returns a list of blueprints with only the
+// required fields for creation, a list of blueprints with the required fields for creation and relations, and a list
+// of blueprints with all fields for creation, relations, and calculation properties.
+// This is done because there might be a case where a blueprint has a relation to another blueprint that
+// hasn't been created yet.
 func deconstructBlueprintsToCreationSteps(rawBlueprints []port.Blueprint) ([]port.Blueprint, [][]port.Blueprint) {
 	var (
 		bareBlueprints []port.Blueprint
 		withRelations  []port.Blueprint
 		fullBlueprints []port.Blueprint
 	)
 
-	for _, bp := range append([]port.Blueprint{}, rawBlueprints...) {
+	for _, bp := range rawBlueprints {
 		bareBlueprint := port.Blueprint{
 			Identifier:  bp.Identifier,
 			Title:       bp.Title,
@@ -89,7 +98,7 @@ func deconstructBlueprintsToCreationSteps(rawBlueprints []port.Blueprint) ([]por
 		withRelations = append(withRelations, withRelation)
 
 		fullBlueprint := withRelation
-		fullBlueprint.FormulaProperties = bp.FormulaProperties
+		fullBlueprint.CalculationProperties = bp.CalculationProperties
 		fullBlueprint.MirrorProperties = bp.MirrorProperties
 		fullBlueprints = append(fullBlueprints, fullBlueprint)
 	}
@@ -109,7 +118,7 @@ func (e *AbortDefaultCreationError) Error() string {
 func validateBlueprintErrors(createdBlueprints []string, blueprintErrors []error) *AbortDefaultCreationError {
 	if len(blueprintErrors) > 0 {
 		for _, err := range blueprintErrors {
-			log.Printf("Failed to create resources: %v.", err.Error())
+			klog.Infof("Failed to create resources: %v.", err.Error())
 		}
 		return &AbortDefaultCreationError{BlueprintsToRollback: createdBlueprints, Errors: blueprintErrors}
 	}
@@ -129,18 +138,21 @@ func createResources(portClient *cli.PortClient, defaults *Defaults, config *por
 
 	var blueprintErrors []error
 	var createdBlueprints []string
+	mutex := sync.Mutex{}
 
 	for _, bp := range bareBlueprints {
 		waitGroup.Add(1)
 		go func(bp port.Blueprint) {
 			defer waitGroup.Done()
 			result, err := blueprint.NewBlueprint(portClient, bp)
 
+			mutex.Lock()
 			if err != nil {
 				blueprintErrors = append(blueprintErrors, err)
 			} else {
 				createdBlueprints = append(createdBlueprints, result.Identifier)
 			}
+			mutex.Unlock()
 		}(bp)
 	}
 	waitGroup.Wait()
@@ -171,7 +183,7 @@ func createResources(portClient *cli.PortClient, defaults *Defaults, config *por
 			waitGroup.Add(1)
 			go func(blueprintIdentifier string, scorecard port.Scorecard) {
 				defer waitGroup.Done()
-				if _, err := scorecards.NewScorecard(portClient, blueprintIdentifier, scorecard); err != nil {
+				if err := scorecards.CreateScorecard(portClient, blueprintIdentifier, scorecard); err != nil {
 					blueprintErrors = append(blueprintErrors, err)
 				}
 			}(blueprintScorecards.Blueprint, scorecard)
@@ -183,7 +195,7 @@ func createResources(portClient *cli.PortClient, defaults *Defaults, config *por
 		return err
 	}
 
-	if err := integration.NewIntegration(portClient, config.StateKey, config.EventListenerType, defaults.AppConfig); err != nil {
+	if err := integration.CreateIntegration(portClient, config.StateKey, config.EventListenerType, defaults.AppConfig); err != nil {
 		log.Printf("Failed to create resources: %v.", err.Error())
 		return &AbortDefaultCreationError{BlueprintsToRollback: createdBlueprints, Errors: []error{err}}
 	}
@@ -198,20 +210,19 @@ func initializeDefaults(portClient *cli.PortClient, config *port.Config) error {
 	}
 
 	if err := createResources(portClient, defaults, config); err != nil {
-		if err != nil {
-			log.Printf("Failed to create resources. Rolling back blueprints: %v", err.BlueprintsToRollback)
-			var rollbackWg sync.WaitGroup
-			for _, identifier := range err.BlueprintsToRollback {
-				rollbackWg.Add(1)
-				go func(identifier string) {
-					defer rollbackWg.Done()
-					_ = blueprint.DeleteBlueprint(portClient, identifier)
-				}(identifier)
-			}
-			rollbackWg.Wait()
-			return &ExceptionGroup{Message: err.Error(), Errors: err.Errors}
+		log.Printf("Failed to create resources. Rolling back blueprints: %v", err.BlueprintsToRollback)
+		var rollbackWg sync.WaitGroup
+		for _, identifier := range err.BlueprintsToRollback {
+			rollbackWg.Add(1)
+			go func(identifier string) {
+				defer rollbackWg.Done()
+				if err := blueprint.DeleteBlueprint(portClient, identifier); err != nil {
+					klog.Warningf("Failed to rollback blueprint %s creation: %v", identifier, err)
+				}
+			}(identifier)
 		}
-		return fmt.Errorf("unknown error during resource creation")
+		rollbackWg.Wait()
+		return &ExceptionGroup{Message: err.Error(), Errors: err.Errors}
 	}
 
 	return nil