Merge pull request #320 from kube-tarian/refactor-model-struct

refactor model structs

capten/Makefile

@@ -32,7 +32,7 @@ build:
  go mod download
  CGO_ENABLED=0 go build -o build/deployment_worker deployment-worker/main.go
  CGO_ENABLED=0 go build -o build/config_worker config-worker/main.go
- CGO_ENABLED=0 go build -o build/agent agent/cmd/agent/main.go
+ CGO_ENABLED=0 go build -o build/agent agent/cmd/main.go
 
 clean:
  rm -rf build

capten/agent/cmd/main.go

@@ -0,0 +1,9 @@
+package main
+
+import (
+ "github.com/kube-tarian/kad/capten/agent/internal/app"
+)
+
+func main() {
+ app.Start()
+}

capten/agent/pkg/agent/agent.go → capten/agent/internal/api/agent.go

@@ -1,15 +1,15 @@
-package agent
+package api
 
 import (
  "context"
  "fmt"
 
  "github.com/intelops/go-common/logging"
- captenstore "github.com/kube-tarian/kad/capten/agent/pkg/capten-store"
- "github.com/kube-tarian/kad/capten/agent/pkg/config"
- "github.com/kube-tarian/kad/capten/agent/pkg/pb/agentpb"
- "github.com/kube-tarian/kad/capten/agent/pkg/pb/captenpluginspb"
- "github.com/kube-tarian/kad/capten/agent/pkg/temporalclient"
+ captenstore "github.com/kube-tarian/kad/capten/agent/internal/capten-store"
+ "github.com/kube-tarian/kad/capten/agent/internal/config"
+ "github.com/kube-tarian/kad/capten/agent/internal/pb/agentpb"
+ "github.com/kube-tarian/kad/capten/agent/internal/pb/captenpluginspb"
+ "github.com/kube-tarian/kad/capten/agent/internal/temporalclient"
 )
 
 var _ agentpb.AgentServer = &Agent{}

capten/agent/pkg/agent/agent_auth.go → capten/agent/internal/api/agent_auth.go

@@ -1,4 +1,4 @@
-package agent
+package api
 
 import (
  "context"

capten/agent/pkg/agent/agent_cluster_apps.go → capten/agent/internal/api/agent_cluster_apps.go

@@ -1,9 +1,9 @@
-package agent
+package api
 
 import (
  "context"
 
- "github.com/kube-tarian/kad/capten/agent/pkg/pb/agentpb"
+ "github.com/kube-tarian/kad/capten/agent/internal/pb/agentpb"
 )
 
 func (a *Agent) SyncApp(ctx context.Context, request *agentpb.SyncAppRequest) (

capten/agent/pkg/agent/agent_cluster_apps_test.go → capten/agent/internal/api/agent_cluster_apps_test.go

@@ -1,12 +1,12 @@
-package agent
+package api
 
 import (
  "context"
  "os"
  "testing"
 
- "github.com/kube-tarian/kad/capten/agent/pkg/config"
- "github.com/kube-tarian/kad/capten/agent/pkg/pb/agentpb"
+ "github.com/kube-tarian/kad/capten/agent/internal/config"
+ "github.com/kube-tarian/kad/capten/agent/internal/pb/agentpb"
  "github.com/kube-tarian/kad/integrator/common-pkg/logging"
  "github.com/stretchr/testify/suite"
  "gopkg.in/yaml.v2"

capten/agent/pkg/agent/agent_conf_sso.go → capten/agent/internal/api/app_config_sso.go

@@ -1,10 +1,11 @@
-package agent
+package api
 
 import (
  "context"
 
- "github.com/kube-tarian/kad/capten/agent/pkg/credential"
- "github.com/kube-tarian/kad/capten/agent/pkg/pb/agentpb"
+ "github.com/kube-tarian/kad/capten/agent/internal/pb/agentpb"
+ "github.com/kube-tarian/kad/capten/common-pkg/credential"
+ "github.com/kube-tarian/kad/capten/model"
  "github.com/pkg/errors"
  "gopkg.in/yaml.v2"
 )
@@ -62,7 +63,7 @@ func (a *Agent) ConfigureAppSSO(ctx context.Context,
  }, nil
  }
 
- updateAppConfig.Config.InstallStatus = string(appUpgradingStatus)
+ updateAppConfig.Config.InstallStatus = string(model.AppUpgradingStatus)
  if err := a.as.UpsertAppConfig(updateAppConfig); err != nil {
  a.log.Errorf("failed to update app config data for app %s, %v", req.ReleaseName, err)
  return &agentpb.ConfigureAppSSOResponse{

capten/agent/pkg/agent/agent_conf_sso_test.go → capten/agent/internal/api/app_config_sso_test.go

@@ -1,4 +1,4 @@
-package agent
+package api
 
 import (
  "testing"

capten/agent/pkg/agent/agent_app_deploy.go → capten/agent/internal/api/app_deploy_apis.go

@@ -1,11 +1,11 @@
-package agent
+package api
 
 import (
  "context"
 
- "github.com/kube-tarian/kad/capten/agent/pkg/model"
- "github.com/kube-tarian/kad/capten/agent/pkg/pb/agentpb"
- "github.com/kube-tarian/kad/capten/agent/pkg/workers"
+ "github.com/kube-tarian/kad/capten/agent/internal/pb/agentpb"
+ "github.com/kube-tarian/kad/capten/agent/internal/workers"
+ "github.com/kube-tarian/kad/capten/model"
  "github.com/pkg/errors"
 )
 
@@ -45,7 +45,7 @@ func (a *Agent) InstallApp(ctx context.Context, request *agentpb.InstallAppReque
  Icon: request.AppConfig.Icon,
  LaunchURL: launchURL,
  LaunchUIDescription: request.AppConfig.LaunchUIDescription,
- InstallStatus: string(appIntallingStatus),
+ InstallStatus: string(model.AppIntallingStatus),
  DefualtApp: request.AppConfig.DefualtApp,
  PluginName: request.AppConfig.PluginName,
  PluginDescription: request.AppConfig.PluginDescription,
@@ -103,7 +103,7 @@ func (a *Agent) UnInstallApp(ctx context.Context, request *agentpb.UnInstallAppR
  Timeout: 10,
  }
 
- appConfigdata.Config.InstallStatus = string(appUnInstallingStatus)
+ appConfigdata.Config.InstallStatus = string(model.AppUnInstallingStatus)
  if err := a.as.UpsertAppConfig(appConfigdata); err != nil {
  a.log.Errorf("failed to update app config status with UnInstalling for app %s, %v", req.ReleaseName, err)
  return &agentpb.UnInstallAppResponse{
@@ -163,7 +163,7 @@ func (a *Agent) UpdateAppValues(ctx context.Context, req *agentpb.UpdateAppValue
  }
 
  appConfig.Config.LaunchURL = launchURL
- appConfig.Config.InstallStatus = string(appUpgradingStatus)
+ appConfig.Config.InstallStatus = string(model.AppUpgradingStatus)
  if err := a.as.UpsertAppConfig(appConfig); err != nil {
  a.log.Errorf("failed to update app config data for app %s, %v", req.ReleaseName, err)
  return &agentpb.UpdateAppValuesResponse{
@@ -238,7 +238,7 @@ func (a *Agent) UpgradeApp(ctx context.Context, req *agentpb.UpgradeAppRequest)
  Icon: req.AppConfig.Icon,
  LaunchURL: launchURL,
  LaunchUIDescription: req.AppConfig.LaunchUIDescription,
- InstallStatus: string(appIntallingStatus),
+ InstallStatus: string(model.AppIntallingStatus),
  DefualtApp: req.AppConfig.DefualtApp,
  PluginName: req.AppConfig.PluginName,
  PluginDescription: req.AppConfig.PluginDescription,
@@ -272,9 +272,9 @@ func (a *Agent) UpgradeApp(ctx context.Context, req *agentpb.UpgradeAppRequest)
 func (a *Agent) installAppWithWorkflow(req *model.ApplicationInstallRequest,
  appConfig *agentpb.SyncAppData) {
  wd := workers.NewDeployment(a.tc, a.log)
- _, err := wd.SendEvent(context.TODO(), string(appInstallAction), req)
+ _, err := wd.SendEvent(context.TODO(), string(model.AppInstallAction), req)
  if err != nil {
- appConfig.Config.InstallStatus = string(appIntallFailedStatus)
+ appConfig.Config.InstallStatus = string(model.AppIntallFailedStatus)
  if err := a.as.UpsertAppConfig(appConfig); err != nil {
  a.log.Errorf("failed to update app config for app %s, %v", appConfig.Config.ReleaseName, err)
  return
@@ -283,7 +283,7 @@ func (a *Agent) installAppWithWorkflow(req *model.ApplicationInstallRequest,
  return
  }
 
- appConfig.Config.InstallStatus = string(appIntalledStatus)
+ appConfig.Config.InstallStatus = string(model.AppIntalledStatus)
  if err := a.as.UpsertAppConfig(appConfig); err != nil {
  a.log.Errorf("failed to update app config for app %s, %v", appConfig.Config.ReleaseName, err)
  return
@@ -292,11 +292,11 @@ func (a *Agent) installAppWithWorkflow(req *model.ApplicationInstallRequest,
 
 func (a *Agent) unInstallAppWithWorkflow(req *model.ApplicationDeleteRequest, appConfig *agentpb.SyncAppData) {
  wd := workers.NewDeployment(a.tc, a.log)
- _, err := wd.SendDeleteEvent(context.TODO(), string(appUnInstallAction), req)
+ _, err := wd.SendDeleteEvent(context.TODO(), string(model.AppUnInstallAction), req)
  if err != nil {
  a.log.Errorf("failed to send delete event to workflow for app %s, %v", req.ReleaseName, err)
 
- appConfig.Config.InstallStatus = string(appIntalledStatus)
+ appConfig.Config.InstallStatus = string(model.AppIntalledStatus)
  if err := a.as.UpsertAppConfig(appConfig); err != nil {
  a.log.Errorf("failed to update app config status with Installed for app %s, %v", req.ReleaseName, err)
  }
@@ -312,9 +312,9 @@ func (a *Agent) unInstallAppWithWorkflow(req *model.ApplicationDeleteRequest, ap
 func (a *Agent) upgradeAppWithWorkflow(req *model.ApplicationInstallRequest,
  appConfig *agentpb.SyncAppData) {
  wd := workers.NewDeployment(a.tc, a.log)
- _, err := wd.SendEvent(context.TODO(), string(appUpgradeAction), req)
+ _, err := wd.SendEvent(context.TODO(), string(model.AppUpgradeAction), req)
  if err != nil {
- appConfig.Config.InstallStatus = string(appUpgradeFaileddStatus)
+ appConfig.Config.InstallStatus = string(model.AppUpgradeFaileddStatus)
  if err := a.as.UpsertAppConfig(appConfig); err != nil {
  a.log.Errorf("failed to update app config for app %s, %v", appConfig.Config.ReleaseName, err)
  return
@@ -323,7 +323,7 @@ func (a *Agent) upgradeAppWithWorkflow(req *model.ApplicationInstallRequest,
  return
  }
 
- appConfig.Config.InstallStatus = string(appUpgradedStatus)
+ appConfig.Config.InstallStatus = string(model.AppUpgradedStatus)
  if err := a.as.UpsertAppConfig(appConfig); err != nil {
  a.log.Errorf("failed to update app config for app %s, %v", appConfig.Config.ReleaseName, err)
  return

capten/agent/pkg/agent/agent_app_values_values.go → capten/agent/internal/api/app_values_util.go

@@ -1,4 +1,4 @@
-package agent
+package api
 
 import (
  "bytes"
@@ -8,9 +8,9 @@ import (
  "strings"
 
  "github.com/intelops/go-common/logging"
- "github.com/kube-tarian/kad/capten/agent/pkg/credential"
- "github.com/kube-tarian/kad/capten/agent/pkg/model"
- "github.com/kube-tarian/kad/capten/agent/pkg/pb/agentpb"
+ "github.com/kube-tarian/kad/capten/agent/internal/pb/agentpb"
+ "github.com/kube-tarian/kad/capten/common-pkg/credential"
+ "github.com/kube-tarian/kad/capten/model"
  "github.com/pkg/errors"
  "gopkg.in/yaml.v2"
 )

capten/agent/pkg/agent/agent_app_values_util_test.go → capten/agent/internal/api/app_values_util_test.go

@@ -1,12 +1,12 @@
-package agent
+package api
 
 import (
  "log"
  "strings"
  "testing"
 
  "github.com/intelops/go-common/logging"
- "github.com/kube-tarian/kad/capten/agent/pkg/pb/agentpb"
+ "github.com/kube-tarian/kad/capten/agent/internal/pb/agentpb"
  "github.com/stretchr/testify/require"
  "gopkg.in/yaml.v2"
 )

capten/agent/pkg/agent/get_capten_plugins.go → capten/agent/internal/api/capten_plugin_apis.go

@@ -1,9 +1,9 @@
-package agent
+package api
 
 import (
  "context"
 
- "github.com/kube-tarian/kad/capten/agent/pkg/pb/captenpluginspb"
+ "github.com/kube-tarian/kad/capten/agent/internal/pb/captenpluginspb"
 )
 
 func (a *Agent) GetCaptenPlugins(ctx context.Context, request *captenpluginspb.GetCaptenPluginsRequest) (

capten/agent/pkg/agent/plugin_argocd_apis.go → capten/agent/internal/api/plugin_argocd_apis.go

@@ -1,14 +1,14 @@
-package agent
+package api
 
 import (
  "context"
  "fmt"
 
  "github.com/intelops/go-common/logging"
- captenstore "github.com/kube-tarian/kad/capten/agent/pkg/capten-store"
- "github.com/kube-tarian/kad/capten/agent/pkg/model"
- "github.com/kube-tarian/kad/capten/agent/pkg/pb/captenpluginspb"
+ captenstore "github.com/kube-tarian/kad/capten/agent/internal/capten-store"
+ "github.com/kube-tarian/kad/capten/agent/internal/pb/captenpluginspb"
  "github.com/kube-tarian/kad/capten/common-pkg/plugins/argocd"
+ "github.com/kube-tarian/kad/capten/model"
 )
 
 const (

capten/agent/pkg/agent/plugin_cloud_provider_apis.go → capten/agent/internal/api/plugin_cloud_provider_apis.go

@@ -1,12 +1,12 @@
-package agent
+package api
 
 import (
  "context"
  "fmt"
 
  "github.com/google/uuid"
  "github.com/intelops/go-common/credentials"
- "github.com/kube-tarian/kad/capten/agent/pkg/pb/captenpluginspb"
+ "github.com/kube-tarian/kad/capten/agent/internal/pb/captenpluginspb"
 )
 
 const cloudProviderEntityName = "cloud-provider"

capten/agent/pkg/agent/plugin_crossplane_project_apis.go → capten/agent/internal/api/plugin_crossplane_project_apis.go

@@ -1,12 +1,12 @@
-package agent
+package api
 
 import (
  "context"
  "fmt"
 
- "github.com/kube-tarian/kad/capten/agent/pkg/model"
- "github.com/kube-tarian/kad/capten/agent/pkg/pb/captenpluginspb"
- "github.com/kube-tarian/kad/capten/agent/pkg/workers"
+ "github.com/kube-tarian/kad/capten/agent/internal/pb/captenpluginspb"
+ "github.com/kube-tarian/kad/capten/agent/internal/workers"
+ "github.com/kube-tarian/kad/capten/model"
  captenmodel "github.com/kube-tarian/kad/capten/model"
 )
 

capten/agent/pkg/agent/plugin_crossplane_provider_apis.go → capten/agent/internal/api/plugin_crossplane_provider_apis.go

@@ -1,11 +1,11 @@
-package agent
+package api
 
 import (
  "context"
 
  "github.com/google/uuid"
- "github.com/kube-tarian/kad/capten/agent/pkg/model"
- "github.com/kube-tarian/kad/capten/agent/pkg/pb/captenpluginspb"
+ "github.com/kube-tarian/kad/capten/agent/internal/pb/captenpluginspb"
+ "github.com/kube-tarian/kad/capten/model"
 )
 
 const (
@@ -77,12 +77,12 @@ func (a *Agent) DeleteCrossplanProvider(ctx context.Context, request *captenplug
 
 func (a *Agent) GetCrossplanProviders(ctx context.Context, _ *captenpluginspb.GetCrossplanProvidersRequest) (
  *captenpluginspb.GetCrossplanProvidersResponse, error) {
-
  a.log.Infof("Get Crossplane Providers request received")
 
  providers, err := a.as.GetCrossplaneProviders()
  if err != nil {
  if err.Error() == objectNotFoundErrorMessage {
+ a.log.Info("No crossplane providers in DB")
  return &captenpluginspb.GetCrossplanProvidersResponse{
  Status: captenpluginspb.StatusCode_NOT_FOUND,
  StatusMessage: "No crossplane providers found",

capten/agent/pkg/agent/plugin_git_apis.go → capten/agent/internal/api/plugin_git_apis.go

@@ -1,12 +1,12 @@
-package agent
+package api
 
 import (
  "context"
  "fmt"
 
  "github.com/google/uuid"
  "github.com/intelops/go-common/credentials"
- "github.com/kube-tarian/kad/capten/agent/pkg/pb/captenpluginspb"
+ "github.com/kube-tarian/kad/capten/agent/internal/pb/captenpluginspb"
 )
 
 const gitProjectEntityName = "git-project"

capten/agent/pkg/agent/plugin_managed_clusters_apis.go → capten/agent/internal/api/plugin_managed_clusters_apis.go

@@ -1,11 +1,11 @@
-package agent
+package api
 
 import (
  "context"
  "fmt"
 
  "github.com/intelops/go-common/credentials"
- "github.com/kube-tarian/kad/capten/agent/pkg/pb/captenpluginspb"
+ "github.com/kube-tarian/kad/capten/agent/internal/pb/captenpluginspb"
 )
 
 const ManagedClusterEntityName = "managedcluster"

capten/agent/pkg/agent/plugin_tekton_apis.go → capten/agent/internal/api/plugin_tekton_apis.go

@@ -1,11 +1,11 @@
-package agent
+package api
 
 import (
  "context"
 
- "github.com/kube-tarian/kad/capten/agent/pkg/model"
- "github.com/kube-tarian/kad/capten/agent/pkg/pb/captenpluginspb"
- "github.com/kube-tarian/kad/capten/agent/pkg/workers"
+ "github.com/kube-tarian/kad/capten/agent/internal/pb/captenpluginspb"
+ "github.com/kube-tarian/kad/capten/agent/internal/workers"
+ "github.com/kube-tarian/kad/capten/model"
  captenmodel "github.com/kube-tarian/kad/capten/model"
 )
 

capten/agent/pkg/agent/agent_store_cred.go → capten/agent/internal/api/store_cred_apis.go

@@ -1,11 +1,11 @@
-package agent
+package api
 
 import (
  "context"
  "fmt"
 
- "github.com/kube-tarian/kad/capten/agent/pkg/credential"
- "github.com/kube-tarian/kad/capten/agent/pkg/pb/agentpb"
+ "github.com/kube-tarian/kad/capten/agent/internal/pb/agentpb"
+ "github.com/kube-tarian/kad/capten/common-pkg/credential"
 
  "github.com/intelops/go-common/credentials"
 )