Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Default dag deploy for hosted #1345

Merged
merged 9 commits into from
Aug 9, 2023
Merged

Default dag deploy for hosted #1345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c004d4b
dag deploy enabled by default in hosted
sunkickr Aug 7, 2023
97afa5c
dag deploy enabled by default in hosted from file
sunkickr Aug 7, 2023
889b6b7
fix from file
sunkickr Aug 7, 2023
7070100
fix lint
sunkickr Aug 8, 2023
96f63b7
fix test
sunkickr Aug 8, 2023
34c7293
fix test
sunkickr Aug 8, 2023
59bfb26
fix test
sunkickr Aug 8, 2023
c03d888
fix test
sunkickr Aug 8, 2023
4041e20
update test coverage
sunkickr Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions cloud/deployment/fromfile/fromfile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ func CreateOrUpdate(inputFile, action string, client astro.Client, coreClient as
existingDeployments []astro.Deployment
nodePools []astrocore.NodePool
jsonOutput bool
dagDeploy bool
)

// get file contents as []byte
Expand Down Expand Up @@ -118,6 +119,16 @@ func CreateOrUpdate(inputFile, action string, client astro.Client, coreClient as
if err != nil {
return err
}
// get correct value for dag deploy
if formattedDeployment.Deployment.Configuration.DagDeployEnabled == nil {
if organization.IsOrgHosted() {
dagDeploy = true
} else {
dagDeploy = false
}
} else {
dagDeploy = *formattedDeployment.Deployment.Configuration.DagDeployEnabled
}
// check if deployment exists
if deploymentExists(existingDeployments, formattedDeployment.Deployment.Configuration.Name) {
// create does not allow updating existing deployments
Expand All @@ -127,7 +138,7 @@ func CreateOrUpdate(inputFile, action string, client astro.Client, coreClient as
}
// this deployment does not exist so create it
// transform formattedDeployment to DeploymentCreateInput
createInput, _, err = getCreateOrUpdateInput(&formattedDeployment, clusterID, workspaceID, createAction, &astro.Deployment{}, nodePools, client)
createInput, _, err = getCreateOrUpdateInput(&formattedDeployment, clusterID, workspaceID, createAction, &astro.Deployment{}, nodePools, dagDeploy, client)
if err != nil {
return err
}
Expand All @@ -148,8 +159,15 @@ func CreateOrUpdate(inputFile, action string, client astro.Client, coreClient as
existingDeployment = deploymentFromName(existingDeployments, formattedDeployment.Deployment.Configuration.Name)
workspaceID = existingDeployment.Workspace.ID

// determine dagDeploy
if formattedDeployment.Deployment.Configuration.DagDeployEnabled == nil {
dagDeploy = existingDeployment.DagDeployEnabled
} else {
dagDeploy = *formattedDeployment.Deployment.Configuration.DagDeployEnabled
}

// transform formattedDeployment to DeploymentUpdateInput
_, updateInput, err = getCreateOrUpdateInput(&formattedDeployment, clusterID, workspaceID, updateAction, &existingDeployment, nodePools, client)
_, updateInput, err = getCreateOrUpdateInput(&formattedDeployment, clusterID, workspaceID, updateAction, &existingDeployment, nodePools, dagDeploy, client)
if err != nil {
return err
}
Expand Down Expand Up @@ -200,7 +218,7 @@ func CreateOrUpdate(inputFile, action string, client astro.Client, coreClient as
// It returns an error if getting default options fail.
// It returns an error if worker-queue options are not valid.
// It returns an error if node pool id could not be found for the worker type.
func getCreateOrUpdateInput(deploymentFromFile *inspect.FormattedDeployment, clusterID, workspaceID, action string, existingDeployment *astro.Deployment, nodePools []astrocore.NodePool, client astro.Client) (astro.CreateDeploymentInput, astro.UpdateDeploymentInput, error) { //nolint
func getCreateOrUpdateInput(deploymentFromFile *inspect.FormattedDeployment, clusterID, workspaceID, action string, existingDeployment *astro.Deployment, nodePools []astrocore.NodePool, dagDeploy bool, client astro.Client) (astro.CreateDeploymentInput, astro.UpdateDeploymentInput, error) { //nolint
var (
defaultOptions astro.WorkerQueueDefaultOptions
configOptions astro.DeploymentConfig
Expand Down Expand Up @@ -279,7 +297,7 @@ func getCreateOrUpdateInput(deploymentFromFile *inspect.FormattedDeployment, clu
Label: deploymentFromFile.Deployment.Configuration.Name,
Description: deploymentFromFile.Deployment.Configuration.Description,
RuntimeReleaseVersion: deploymentFromFile.Deployment.Configuration.RunTimeVersion,
DagDeployEnabled: deploymentFromFile.Deployment.Configuration.DagDeployEnabled,
DagDeployEnabled: dagDeploy,
SchedulerSize: deploymentFromFile.Deployment.Configuration.SchedulerSize,
APIKeyOnlyDeployments: deploymentFromFile.Deployment.Configuration.APIKeyOnlyDeployments,
IsHighAvailability: deploymentFromFile.Deployment.Configuration.IsHighAvailability,
Expand All @@ -303,7 +321,7 @@ func getCreateOrUpdateInput(deploymentFromFile *inspect.FormattedDeployment, clu
ClusterID: clusterID,
Label: deploymentFromFile.Deployment.Configuration.Name,
Description: deploymentFromFile.Deployment.Configuration.Description,
DagDeployEnabled: deploymentFromFile.Deployment.Configuration.DagDeployEnabled,
DagDeployEnabled: dagDeploy,
SchedulerSize: deploymentFromFile.Deployment.Configuration.SchedulerSize,
APIKeyOnlyDeployments: deploymentFromFile.Deployment.Configuration.APIKeyOnlyDeployments,
IsHighAvailability: deploymentFromFile.Deployment.Configuration.IsHighAvailability,
Expand Down
Loading