Skip to content

feat: added description field for environment #3020

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

Merged
merged 19 commits into from
Apr 13, 2023
Merged

feat: added description field for environment #3020

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d6e1a70
Changes for cluster name instead of server url
mayank-devtron Feb 14, 2023
a30d859
Further changes for use cluster name
mayank-devtron Feb 14, 2023
f809c4a
adding description field
mayank-devtron Feb 21, 2023
70f4e7a
revert another branch change
mayank-devtron Feb 21, 2023
c300919
minor changes
mayank-devtron Feb 22, 2023
d01dd2d
changes in description
mayank-devtron Feb 22, 2023
8ca1f65
minor changes
mayank-devtron Mar 27, 2023
112f81a
sync with main
mayank-devtron Mar 27, 2023
de06ba7
rename file
mayank-devtron Mar 27, 2023
aa94f4d
sql file rename
mayank-devtron Apr 3, 2023
e733f4a
sync with main
mayank-devtron Apr 3, 2023
70d4b61
query changes for app/other-env api
mayank-devtron Apr 5, 2023
56bb8c5
minor api changes
mayank-devtron Apr 5, 2023
19e8e3f
merge conflicts resolved
mayank-devtron Apr 12, 2023
9ba76f0
update sql script file name
mayank-devtron Apr 12, 2023
18d8392
minor api changes
mayank-devtron Apr 12, 2023
97daaff
minor api changes for description
mayank-devtron Apr 12, 2023
8b6ffe2
api changes
mayank-devtron Apr 12, 2023
b0a1ac3
Merge branch 'main' into provide_short_description_for_environment_name
mayank-devtron Apr 13, 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
13 changes: 13 additions & 0 deletions pkg/cluster/EnvironmentService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ type EnvironmentBean struct {
Namespace string `json:"namespace,omitempty" validate:"name-space-component,max=50"`
CdArgoSetup bool `json:"isClusterCdActive"`
EnvironmentIdentifier string `json:"environmentIdentifier"`
Description string `json:"description" validate:"max=40"`
AppCount int `json:"appCount"`
}

Expand All @@ -52,6 +53,7 @@ type EnvDto struct {
EnvironmentName string `json:"environmentName,omitempty" validate:"max=50"`
Namespace string `json:"namespace,omitempty" validate:"name-space-component,max=50"`
EnvironmentIdentifier string `json:"environmentIdentifier,omitempty"`
Description string `json:"description" validate:"max=40"`
}

type ClusterEnvDto struct {
Expand Down Expand Up @@ -143,6 +145,7 @@ func (impl EnvironmentServiceImpl) Create(mappings *EnvironmentBean, userId int3
Active: mappings.Active,
Namespace: mappings.Namespace,
Default: mappings.Default,
Description: mappings.Description,
EnvironmentIdentifier: identifier,
}
model.CreatedBy = userId
Expand Down Expand Up @@ -191,6 +194,7 @@ func (impl EnvironmentServiceImpl) FindOne(environment string) (*EnvironmentBean
Namespace: model.Namespace,
Default: model.Default,
EnvironmentIdentifier: model.EnvironmentIdentifier,
Description: model.Description,
}
return bean, nil
}
Expand All @@ -213,6 +217,7 @@ func (impl EnvironmentServiceImpl) GetAll() ([]EnvironmentBean, error) {
Default: model.Default,
CdArgoSetup: model.Cluster.CdArgoSetup,
EnvironmentIdentifier: model.EnvironmentIdentifier,
Description: model.Description,
})
}
return beans, nil
Expand All @@ -235,6 +240,7 @@ func (impl EnvironmentServiceImpl) GetAllActive() ([]EnvironmentBean, error) {
Namespace: model.Namespace,
Default: model.Default,
EnvironmentIdentifier: model.EnvironmentIdentifier,
Description: model.Description,
})
}
return beans, nil
Expand All @@ -255,6 +261,7 @@ func (impl EnvironmentServiceImpl) FindById(id int) (*EnvironmentBean, error) {
Namespace: model.Namespace,
Default: model.Default,
EnvironmentIdentifier: model.EnvironmentIdentifier,
Description: model.Description,
}

/*clusterBean := &ClusterBean{
Expand Down Expand Up @@ -287,6 +294,7 @@ func (impl EnvironmentServiceImpl) Update(mappings *EnvironmentBean, userId int3
model.Default = mappings.Default
model.UpdatedBy = userId
model.UpdatedOn = time.Now()
model.Description = mappings.Description

//namespace create if not exist
if len(model.Namespace) > 0 {
Expand Down Expand Up @@ -366,6 +374,7 @@ func (impl EnvironmentServiceImpl) GetEnvironmentListForAutocomplete() ([]Enviro
CdArgoSetup: model.Cluster.CdArgoSetup,
EnvironmentIdentifier: model.EnvironmentIdentifier,
ClusterName: model.Cluster.ClusterName,
Description: model.Description,
})
}
return beans, nil
Expand Down Expand Up @@ -402,6 +411,7 @@ func (impl EnvironmentServiceImpl) FindByIds(ids []*int) ([]*EnvironmentBean, er
Default: model.Default,
EnvironmentIdentifier: model.EnvironmentIdentifier,
ClusterId: model.ClusterId,
Description: model.Description,
})
}
return beans, nil
Expand All @@ -424,6 +434,7 @@ func (impl EnvironmentServiceImpl) GetByClusterId(id int) ([]*EnvironmentBean, e
Environment: model.Name,
Namespace: model.Namespace,
EnvironmentIdentifier: model.EnvironmentIdentifier,
Description: model.Description,
})
}
return beans, nil
Expand Down Expand Up @@ -465,6 +476,7 @@ func (impl EnvironmentServiceImpl) GetCombinedEnvironmentListForDropDown(token s
EnvironmentName: model.Name,
Namespace: model.Namespace,
EnvironmentIdentifier: model.EnvironmentIdentifier,
Description: model.Description,
})
}

Expand Down Expand Up @@ -544,6 +556,7 @@ func (impl EnvironmentServiceImpl) GetCombinedEnvironmentListForDropDownByCluste
EnvironmentName: model.Name,
Namespace: model.Namespace,
EnvironmentIdentifier: model.EnvironmentIdentifier,
Description: model.Description,
})
}

Expand Down
1 change: 1 addition & 0 deletions pkg/cluster/repository/EnvironmentRepository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ type Environment struct {
GrafanaDatasourceId int `sql:"grafana_datasource_id"`
Namespace string `sql:"namespace"`
EnvironmentIdentifier string `sql:"environment_identifier"`
Description string `sql:"description"`
sql.AuditLog
}

Expand Down
1 change: 1 addition & 0 deletions scripts/sql/124_alter_environment_description.down.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE environment DROP COLUMN description;
3 changes: 3 additions & 0 deletions scripts/sql/124_alter_environment_description.up.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ALTER TABLE environment ADD COLUMN description VARCHAR(40);