-
Notifications
You must be signed in to change notification settings - Fork 484
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.
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
fix: review comment fixes for user defined GitOps repo url #4729
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ash-exp
requested review from
vikramdevtron,
kripanshdevtron and
nishant-d
as code owners
February 29, 2024 12:15
Quality Gate passedIssues Measures |
Ash-exp
added a commit
that referenced
this pull request
Mar 5, 2024
* wip: global gitops config updated * feat: devtron app stage API * validate custom git repo url helm apps * wip * updated: custom git repo url validate function * wip: devtron app flow * feat: handling for helm apps and edge cases of devtron apps * updated migration * fixed: app stage api query * updated FetchAppStageStatus function * fixed: import cycle error * fix: validation handling * fixed: pg no rows error * fixed: nil pointer issue * wire files added * updated: validation function * feat: updated validations and added IsGitOpsRepoNotConfigured * feat: added IsGitOpsRepoNotConfigured to app-wf API * fixed: create cd pipeline flow * feat: handling for azure devops * added GitOpsRepoMigrationRequired for devtron apps * fixed: pg no row for app-wf API * fixed: pg no row for app-wf API * fixed: pg no row for app-wf API * fixed: pg no row for app-wf API * fixed: isGitOpsRepoNotConfigured in app-wf API * fixed condition for cd pipeline create * refactored conditions * fixed: IsGitOpsRepoConfiguredForDevtronApps condition * refactored: condition * fixed: cd pipeline create issues * fixed: GetGitOpsConfigurationOfApp * fixed: GetGitOpsConfigurationOfApp * fixed: GetGitOpsConfigurationOfApp * fixed: RegisterInArgo logic * wip * handling for pre and post CD * updated flag for app group * fixed: error handling * PR comments resolved * removed unnecessary changes * fixed: auto trigger * fixed: releaseErr skipped * fixed: gitops repo migration * updated: migration number * fixed: API response * chore: fixed helm app default gitops url * fixed: repo creation helm app * added logger to AddDeploymentEnforcementConfig * updated: down migration * updated: comments * chore: removed unnecessary statement * removed unnecessary todo * feat: Gitops repo refactor (#4492) * refactored and backward compatibility handling for gitops repo name * fixed: wire issue * fixed: query condition * beta: fix argocd register * beta: fix argocd register * beta: added log * beta: added TODO * beta: fixed missing payload * beta: fixed missing payload * added: ssh clone stage to validation * fix: Error code changed for resource api (#4414) * letting build abort even after starting stage of ci_workflow * error 500 removed * forceAbort query param in cancle stage * minor fix * minor fix * error 500 removed * some random change * fix * some error messaging changed * if workflow already cancelled then return from ci success event * helm uninstall issue fixed * status code changes * changed err code and msg in getWorkflowLogs in cihandler * k8s issue fixed for 409 * when workflow not found to terminate then throw bad req instead of 5xx * fix * fix * incorporated grpc code check in cd-pipeline/trigger api in createHelmAppForCdPipeline func * small fix * minor refactoring * revert cd-pipeline/trigger 5xx fix * bug fix --------- Co-authored-by: Prakash Kumar <[email protected]> Co-authored-by: ShashwatDadhich <[email protected]> * updated API error * removed empty repo in Custom Validation and added retry to RegisterInArgo * removed empty repo in Custom Validation and added retry to RegisterInArgo * fixed: clone validation * added validation for unique repo * fixed: missing payload issue * fixed: RegisterInArgo func * fixed: RegisterInArgo func * fixed nil pointer issue * fixed: nil pointer issue * removed: custom validation * removed: unused wire injections * added: org git repo validation * fixed: org git repo validation * fixed api error * fixed api error * fixed api error * feat: refactoring authorisation checks and support of super-admin in permissions groups. (#4433) * refactored directories * refactoring in enforcer code, removed enforceByEmail/InBatch usages * removed isSuperAdmin method calls * updated missed auth check * replaced userService.GetById methods by lighter calls * replaced getEmailFromToken by lighter calls * removed remaining 2 usages of enforceByEmail * self registration roles service renaming * updated authenticator version for userVerifier changes * added sql file for creating user group * test: Origin/self register auth change (#4479) * global-authorisation and resfactoring * rbacfor deletematerial * script number change * role group superAdmin support * script change * sql script delete * super-admin role group * chart group duplication fix * api-token * check user roles for super admin group * updated authenticator version --------- Co-authored-by: Shivam Nagar <[email protected]> Co-authored-by: Shivam-nagar23 <[email protected]> * fixed: default git repo name * fixed: default validation --------- Co-authored-by: Aditya Ranjan <[email protected]> Co-authored-by: Prakash Kumar <[email protected]> Co-authored-by: ShashwatDadhich <[email protected]> Co-authored-by: kartik-579 <[email protected]> Co-authored-by: Shivam Nagar <[email protected]> Co-authored-by: Shivam-nagar23 <[email protected]> * sql script update (#4522) * fix: panic in app clone service for [linked ci, external ci, linked cd] cases (#4526) * fix for panic in app clone service for linked ci case * updated fix * dex-config namespace configurable (#4499) * adding isHook and hook type in ResourceNode obj in proto file (#4472) * feat: Adds support for gRPC in health probes (#4495) * Adds support for gRPC in health probes * grpc support in deployment, sts, rollout chart * migration for chart ref 4.19 * adds hidden files .helmignore and ,image_descriptor_template.json in 4.19.0 * adds copacetic plugin migration * Revert "adds copacetic plugin migration" This reverts commit 60df5d1. * Update statefulset.yaml replaced liveness with readiness wherever required * deleted ref 4.19 --------- Co-authored-by: Rupin Solanki <[email protected]> * fix: show deployed time for artifacts those were deployed in past (#4446) * set deployed and deployed at fields values in artifacts * set deployed and deployed at fields values in artifacts * remove unused ids slice * review changes * doc: Created Catalog Framework Doc (#4512) * blank draft * Catalog Framework Doc * Incorporated SME Feedback * Incorporated PM Feedback * docs: Segregated SSO Docs + Added Auto-Assign Permissions Feature (#4493) * Segregated SSO Docs + Added Auto-Assign Permissions Feature * Incorporated Feedback * Added Redirect URI snaps * Incorporated PM Feedback * fix: error handling for trigger release (#4488) * fixed: error handling for trigger release * removed: common return statements * fix: resource tree err handling (#4530) * improved error handling for resource tree * added return to avoid multiple writes * fix: CD stage trigger is not working for external CI (#4440) * fix: CD stage trigger for external CI * feat: handling for DataSource type backward compatibility * migration for deprecated DataSourceType * updated ArtifactsSourceType const * updated: ci_artifact.data_source migration condition (#4548) * fix: Image-Scanner status for failed request (#4513) * retry envs added * json naming * migration for image scan plugin and retry env fix * fix * image scan migration script updated - added new input variables * migration updated * migration updated * name changed * refactor * added default value and change script no * chore: added sql-validator in git-hub action (#4255) * added sql-validator in git-hub action * removed exit commands * edited the grep with whole word * modified * modified comments --------- Co-authored-by: Badal Kumar Prusty <[email protected]> * feat: Adds Copacetic plugin to patch vulnerable images (#4566) * Adds copacetic plugin * copacetic plugin: adds plugin icon and updates url in migration file * Update 211_copacetic_plugin_v1_0_0.up.sql adds copa patch command exit condition * Update 211_copacetic_plugin_v1_0_0.up.sql adds exit 1 if patching multi architecture image * dummy commit 211_copacetic_plugin_v1_0_0.up.sql dummy commit * chore: added sql-validator in git-hub action (#4255) * added sql-validator in git-hub action * removed exit commands * edited the grep with whole word * modified * modified comments --------- Co-authored-by: Badal Kumar Prusty <[email protected]> * updates migration no. --------- Co-authored-by: Badal Kumar <[email protected]> Co-authored-by: Badal Kumar Prusty <[email protected]> * feat: Create Dockerslim plugin and Create EKS Cluster plugin (#4525) * Plugins icon * eks and dockerslim plugin sql up * eks and dockerslim plugin down script * dockerslim plugin after review PR * Changes after review dockerslim * image changes * new image dockerslim * eks creation plugin * Final PR commit, eks and dockerslim plugins * feat: making pre,post,deploy triggers flows idempotent (#4486) * update common-lib * added idempotency code and common-lib version bump * added the optionsal validations pubsub msg pre-processing-hooks logic and added duplicate trigger check as a validation for pre,post,deploy trigger flows * bump common-lib * added callback logger func * sql scripts added * query fix * query fix * fix * refactoring * remove dag exececutor dependency from ciEeventHalndler Sevice * bump common-lib * move context to trigger context * add logs * migration version fix * remove test data * update script number --------- Co-authored-by: Kripansh <[email protected]> * chore: refactoring branch merge * fix: sql script added for putting Identifier type=0 for all null values present in generic_note (#4568) * script for initializing null identifier type col to 0(cluster type) * script fix * empty script for 216 * 216 up script revert * fix: 500 fixes second iteration (#4464) * FetchChartNotes return 4xx when installed app or installed app versions not found * GetDeploymentHistory and GetInstalledAppVersion to return 4xx when installed app or installed app versions not found * fixes * adding pg:",discard_unknown_columns" in tables where doesn't exist * fix for Git Sensor response * fix for inception * fix for k8s resource delete * fix for pipeline already exists * fix for pipeline already exists * fix * fix * fix * fix * go mod version changes * merged * common lib main version sync * main merge --------- Co-authored-by: ShashwatDadhich <[email protected]> * chore: updated migration number * chore: update stale data status code * chore: update error status code * updated: custom gitops repo handling * added: API code for conflict state identification * chore: reverted error condition * code refactoring * fixed: nil pointer * fix: gitops auto fix repo issue * fix: devtron-app gitops repo migration * chore: added wire gen file * fix: GitOps repo migration in devtron app * fix: GitOps repo migration in devtron app * chore: update migration number * fix: org url validation * fix: is gitops configured flag data in workflow response * chore: fixed validation condition * fix: gitops repo url for helm installation * replaced handleCustomGitOpsRepoValidation func * added default value for env variable * fix: review comment fixes for user defined GitOps repo url (#4729) * incorporated review comments * updated import alias * updated github host url validation * fix: gitops repo url is visible for cli migrated helm apps --------- Co-authored-by: Aditya Ranjan <[email protected]> Co-authored-by: Prakash Kumar <[email protected]> Co-authored-by: ShashwatDadhich <[email protected]> Co-authored-by: kartik-579 <[email protected]> Co-authored-by: Shivam Nagar <[email protected]> Co-authored-by: Shivam-nagar23 <[email protected]> Co-authored-by: Shashwat Dadhich <[email protected]> Co-authored-by: tayalrishabh96 <[email protected]> Co-authored-by: Rupin Solanki <[email protected]> Co-authored-by: Gireesh Naidu <[email protected]> Co-authored-by: ashokdevtron <[email protected]> Co-authored-by: ashishdevtron <[email protected]> Co-authored-by: Badal Kumar <[email protected]> Co-authored-by: Badal Kumar Prusty <[email protected]> Co-authored-by: Rupin Solanki <[email protected]> Co-authored-by: Kripansh <[email protected]>
raunit-verma
pushed a commit
to raunit-verma/devtron
that referenced
this pull request
Mar 11, 2024
* wip: global gitops config updated * feat: devtron app stage API * validate custom git repo url helm apps * wip * updated: custom git repo url validate function * wip: devtron app flow * feat: handling for helm apps and edge cases of devtron apps * updated migration * fixed: app stage api query * updated FetchAppStageStatus function * fixed: import cycle error * fix: validation handling * fixed: pg no rows error * fixed: nil pointer issue * wire files added * updated: validation function * feat: updated validations and added IsGitOpsRepoNotConfigured * feat: added IsGitOpsRepoNotConfigured to app-wf API * fixed: create cd pipeline flow * feat: handling for azure devops * added GitOpsRepoMigrationRequired for devtron apps * fixed: pg no row for app-wf API * fixed: pg no row for app-wf API * fixed: pg no row for app-wf API * fixed: pg no row for app-wf API * fixed: isGitOpsRepoNotConfigured in app-wf API * fixed condition for cd pipeline create * refactored conditions * fixed: IsGitOpsRepoConfiguredForDevtronApps condition * refactored: condition * fixed: cd pipeline create issues * fixed: GetGitOpsConfigurationOfApp * fixed: GetGitOpsConfigurationOfApp * fixed: GetGitOpsConfigurationOfApp * fixed: RegisterInArgo logic * wip * handling for pre and post CD * updated flag for app group * fixed: error handling * PR comments resolved * removed unnecessary changes * fixed: auto trigger * fixed: releaseErr skipped * fixed: gitops repo migration * updated: migration number * fixed: API response * chore: fixed helm app default gitops url * fixed: repo creation helm app * added logger to AddDeploymentEnforcementConfig * updated: down migration * updated: comments * chore: removed unnecessary statement * removed unnecessary todo * feat: Gitops repo refactor (devtron-labs#4492) * refactored and backward compatibility handling for gitops repo name * fixed: wire issue * fixed: query condition * beta: fix argocd register * beta: fix argocd register * beta: added log * beta: added TODO * beta: fixed missing payload * beta: fixed missing payload * added: ssh clone stage to validation * fix: Error code changed for resource api (devtron-labs#4414) * letting build abort even after starting stage of ci_workflow * error 500 removed * forceAbort query param in cancle stage * minor fix * minor fix * error 500 removed * some random change * fix * some error messaging changed * if workflow already cancelled then return from ci success event * helm uninstall issue fixed * status code changes * changed err code and msg in getWorkflowLogs in cihandler * k8s issue fixed for 409 * when workflow not found to terminate then throw bad req instead of 5xx * fix * fix * incorporated grpc code check in cd-pipeline/trigger api in createHelmAppForCdPipeline func * small fix * minor refactoring * revert cd-pipeline/trigger 5xx fix * bug fix --------- Co-authored-by: Prakash Kumar <[email protected]> Co-authored-by: ShashwatDadhich <[email protected]> * updated API error * removed empty repo in Custom Validation and added retry to RegisterInArgo * removed empty repo in Custom Validation and added retry to RegisterInArgo * fixed: clone validation * added validation for unique repo * fixed: missing payload issue * fixed: RegisterInArgo func * fixed: RegisterInArgo func * fixed nil pointer issue * fixed: nil pointer issue * removed: custom validation * removed: unused wire injections * added: org git repo validation * fixed: org git repo validation * fixed api error * fixed api error * fixed api error * feat: refactoring authorisation checks and support of super-admin in permissions groups. (devtron-labs#4433) * refactored directories * refactoring in enforcer code, removed enforceByEmail/InBatch usages * removed isSuperAdmin method calls * updated missed auth check * replaced userService.GetById methods by lighter calls * replaced getEmailFromToken by lighter calls * removed remaining 2 usages of enforceByEmail * self registration roles service renaming * updated authenticator version for userVerifier changes * added sql file for creating user group * test: Origin/self register auth change (devtron-labs#4479) * global-authorisation and resfactoring * rbacfor deletematerial * script number change * role group superAdmin support * script change * sql script delete * super-admin role group * chart group duplication fix * api-token * check user roles for super admin group * updated authenticator version --------- Co-authored-by: Shivam Nagar <[email protected]> Co-authored-by: Shivam-nagar23 <[email protected]> * fixed: default git repo name * fixed: default validation --------- Co-authored-by: Aditya Ranjan <[email protected]> Co-authored-by: Prakash Kumar <[email protected]> Co-authored-by: ShashwatDadhich <[email protected]> Co-authored-by: kartik-579 <[email protected]> Co-authored-by: Shivam Nagar <[email protected]> Co-authored-by: Shivam-nagar23 <[email protected]> * sql script update (devtron-labs#4522) * fix: panic in app clone service for [linked ci, external ci, linked cd] cases (devtron-labs#4526) * fix for panic in app clone service for linked ci case * updated fix * dex-config namespace configurable (devtron-labs#4499) * adding isHook and hook type in ResourceNode obj in proto file (devtron-labs#4472) * feat: Adds support for gRPC in health probes (devtron-labs#4495) * Adds support for gRPC in health probes * grpc support in deployment, sts, rollout chart * migration for chart ref 4.19 * adds hidden files .helmignore and ,image_descriptor_template.json in 4.19.0 * adds copacetic plugin migration * Revert "adds copacetic plugin migration" This reverts commit 60df5d1. * Update statefulset.yaml replaced liveness with readiness wherever required * deleted ref 4.19 --------- Co-authored-by: Rupin Solanki <[email protected]> * fix: show deployed time for artifacts those were deployed in past (devtron-labs#4446) * set deployed and deployed at fields values in artifacts * set deployed and deployed at fields values in artifacts * remove unused ids slice * review changes * doc: Created Catalog Framework Doc (devtron-labs#4512) * blank draft * Catalog Framework Doc * Incorporated SME Feedback * Incorporated PM Feedback * docs: Segregated SSO Docs + Added Auto-Assign Permissions Feature (devtron-labs#4493) * Segregated SSO Docs + Added Auto-Assign Permissions Feature * Incorporated Feedback * Added Redirect URI snaps * Incorporated PM Feedback * fix: error handling for trigger release (devtron-labs#4488) * fixed: error handling for trigger release * removed: common return statements * fix: resource tree err handling (devtron-labs#4530) * improved error handling for resource tree * added return to avoid multiple writes * fix: CD stage trigger is not working for external CI (devtron-labs#4440) * fix: CD stage trigger for external CI * feat: handling for DataSource type backward compatibility * migration for deprecated DataSourceType * updated ArtifactsSourceType const * updated: ci_artifact.data_source migration condition (devtron-labs#4548) * fix: Image-Scanner status for failed request (devtron-labs#4513) * retry envs added * json naming * migration for image scan plugin and retry env fix * fix * image scan migration script updated - added new input variables * migration updated * migration updated * name changed * refactor * added default value and change script no * chore: added sql-validator in git-hub action (devtron-labs#4255) * added sql-validator in git-hub action * removed exit commands * edited the grep with whole word * modified * modified comments --------- Co-authored-by: Badal Kumar Prusty <[email protected]> * feat: Adds Copacetic plugin to patch vulnerable images (devtron-labs#4566) * Adds copacetic plugin * copacetic plugin: adds plugin icon and updates url in migration file * Update 211_copacetic_plugin_v1_0_0.up.sql adds copa patch command exit condition * Update 211_copacetic_plugin_v1_0_0.up.sql adds exit 1 if patching multi architecture image * dummy commit 211_copacetic_plugin_v1_0_0.up.sql dummy commit * chore: added sql-validator in git-hub action (devtron-labs#4255) * added sql-validator in git-hub action * removed exit commands * edited the grep with whole word * modified * modified comments --------- Co-authored-by: Badal Kumar Prusty <[email protected]> * updates migration no. --------- Co-authored-by: Badal Kumar <[email protected]> Co-authored-by: Badal Kumar Prusty <[email protected]> * feat: Create Dockerslim plugin and Create EKS Cluster plugin (devtron-labs#4525) * Plugins icon * eks and dockerslim plugin sql up * eks and dockerslim plugin down script * dockerslim plugin after review PR * Changes after review dockerslim * image changes * new image dockerslim * eks creation plugin * Final PR commit, eks and dockerslim plugins * feat: making pre,post,deploy triggers flows idempotent (devtron-labs#4486) * update common-lib * added idempotency code and common-lib version bump * added the optionsal validations pubsub msg pre-processing-hooks logic and added duplicate trigger check as a validation for pre,post,deploy trigger flows * bump common-lib * added callback logger func * sql scripts added * query fix * query fix * fix * refactoring * remove dag exececutor dependency from ciEeventHalndler Sevice * bump common-lib * move context to trigger context * add logs * migration version fix * remove test data * update script number --------- Co-authored-by: Kripansh <[email protected]> * chore: refactoring branch merge * fix: sql script added for putting Identifier type=0 for all null values present in generic_note (devtron-labs#4568) * script for initializing null identifier type col to 0(cluster type) * script fix * empty script for 216 * 216 up script revert * fix: 500 fixes second iteration (devtron-labs#4464) * FetchChartNotes return 4xx when installed app or installed app versions not found * GetDeploymentHistory and GetInstalledAppVersion to return 4xx when installed app or installed app versions not found * fixes * adding pg:",discard_unknown_columns" in tables where doesn't exist * fix for Git Sensor response * fix for inception * fix for k8s resource delete * fix for pipeline already exists * fix for pipeline already exists * fix * fix * fix * fix * go mod version changes * merged * common lib main version sync * main merge --------- Co-authored-by: ShashwatDadhich <[email protected]> * chore: updated migration number * chore: update stale data status code * chore: update error status code * updated: custom gitops repo handling * added: API code for conflict state identification * chore: reverted error condition * code refactoring * fixed: nil pointer * fix: gitops auto fix repo issue * fix: devtron-app gitops repo migration * chore: added wire gen file * fix: GitOps repo migration in devtron app * fix: GitOps repo migration in devtron app * chore: update migration number * fix: org url validation * fix: is gitops configured flag data in workflow response * chore: fixed validation condition * fix: gitops repo url for helm installation * replaced handleCustomGitOpsRepoValidation func * added default value for env variable * fix: review comment fixes for user defined GitOps repo url (devtron-labs#4729) * incorporated review comments * updated import alias * updated github host url validation * fix: gitops repo url is visible for cli migrated helm apps --------- Co-authored-by: Aditya Ranjan <[email protected]> Co-authored-by: Prakash Kumar <[email protected]> Co-authored-by: ShashwatDadhich <[email protected]> Co-authored-by: kartik-579 <[email protected]> Co-authored-by: Shivam Nagar <[email protected]> Co-authored-by: Shivam-nagar23 <[email protected]> Co-authored-by: Shashwat Dadhich <[email protected]> Co-authored-by: tayalrishabh96 <[email protected]> Co-authored-by: Rupin Solanki <[email protected]> Co-authored-by: Gireesh Naidu <[email protected]> Co-authored-by: ashokdevtron <[email protected]> Co-authored-by: ashishdevtron <[email protected]> Co-authored-by: Badal Kumar <[email protected]> Co-authored-by: Badal Kumar Prusty <[email protected]> Co-authored-by: Rupin Solanki <[email protected]> Co-authored-by: Kripansh <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR review comment fixes