Sync Release 2.14.x #79
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,21 @@ | |
| * Add date here... Add signature here... | ||
| - Add your reason here... | ||
|
|
||
| * Nov 07 2025 <[email protected]> | ||
| - Refresh base image | ||
|
|
||
| * Oct 27 2025 <[email protected]> | ||
| - Refresh base image | ||
|
|
||
| * Sep 09 2025 <[email protected]> | ||
| - Refresh base image | ||
|
|
||
| * Sep 05 2025 <[email protected]> | ||
| - Refresh base image | ||
|
|
||
| * Aug 29 2025 <[email protected]> | ||
| - Refresh base image | ||
|
|
||
| * Aug 12 2025 <[email protected]> | ||
| - Refresh base image | ||
|
|
||
|
|
@@ -33,4 +48,4 @@ | |
| - Refresh base image | ||
|
|
||
| * Jul 15 2021 <[email protected]> | ||
| - Create this file to trigger build base action in buld-package workflow | ||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| v2.14.1 |
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| /* | ||
| Initialize skip_audit_log_database configuration based on existing audit log usage - Only insert the configuration if it doesn't already exist | ||
| 1. If tables exist and show evidence of previous usage | ||
| set skip_audit_log_database to false | ||
| 2. If tables exist but show no evidence of usage, don't create the configuration record | ||
| */ | ||
| DO $$ | ||
| BEGIN | ||
| IF EXISTS (SELECT 1 FROM properties WHERE k = 'skip_audit_log_database') THEN | ||
| RETURN; | ||
| END IF; | ||
|
|
||
| IF (SELECT last_value FROM audit_log_id_seq) > 1 | ||
|
There was a problem hiding this comment. The sequence check misses the case where exactly one audit-log row exists: Prompt for AI agents
|
||
| OR (SELECT last_value FROM audit_log_ext_id_seq) > 1 THEN | ||
| INSERT INTO properties (k, v) VALUES ('skip_audit_log_database', 'false'); | ||
| END IF; | ||
| END $$; | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -22,12 +22,14 @@ import ( | |||||
| "net/url" | ||||||
| "os" | ||||||
| "os/signal" | ||||||
| "strconv" | ||||||
| "strings" | ||||||
| "syscall" | ||||||
| "time" | ||||||
|
|
||||||
| "github.com/beego/beego/v2/server/web" | ||||||
|
|
||||||
| "github.com/goharbor/harbor/src/common" | ||||||
| "github.com/goharbor/harbor/src/common/dao" | ||||||
| common_http "github.com/goharbor/harbor/src/common/http" | ||||||
| configCtl "github.com/goharbor/harbor/src/controller/config" | ||||||
|
|
@@ -222,6 +224,10 @@ func main() { | |||||
| log.Error(err) | ||||||
| } | ||||||
|
|
||||||
| // Allow user to disable writing audit log to db by env while initialize | ||||||
| if err := initSkipAuditDBbyEnv(ctx); err != nil { | ||||||
| log.Errorf("Failed to initialize SkipAuditDB by ENV: %v", err) | ||||||
| } | ||||||
| // Init API handler | ||||||
| if err := api.Init(); err != nil { | ||||||
| log.Fatalf("Failed to initialize API handlers with error: %s", err.Error()) | ||||||
|
|
@@ -356,3 +362,34 @@ func getDefaultScannerName() string { | |||||
| } | ||||||
| return "" | ||||||
| } | ||||||
|
|
||||||
| func initSkipAuditDBbyEnv(ctx context.Context) error { | ||||||
| var err error | ||||||
| skipAuditEnv := false | ||||||
| s := os.Getenv("SKIP_LOG_AUDIT_DATABASE") | ||||||
| if s != "" { | ||||||
| skipAuditEnv, err = strconv.ParseBool(s) | ||||||
| if err != nil { | ||||||
| log.Warningf("Failed to parse SKIP_LOG_AUDIT_DATABASE to bool with error: %v, Will use SKIP_LOG_AUDIT_DATABASE env as false", err) | ||||||
| } | ||||||
| } | ||||||
| log.Debugf("get SKIP_LOG_AUDIT_DATABASE from Env is %v", skipAuditEnv) | ||||||
|
|
||||||
| // get from db | ||||||
| mgr := config.GetCfgManager(ctx) | ||||||
| cfg, err := mgr.GetItemFromDriver(ctx, common.SkipAuditLogDatabase) | ||||||
| if err != nil { | ||||||
| return err | ||||||
| } | ||||||
| // if key not exist in the db, set default ENV value | ||||||
| if val, ok := cfg[common.SkipAuditLogDatabase]; !ok { | ||||||
| log.Debugf("key SkipAuditLogDatabase do not exist in the db, will initialize as %v", skipAuditEnv) | ||||||
| cfg[common.SkipAuditLogDatabase] = skipAuditEnv | ||||||
| if err := mgr.UpdateConfig(ctx, cfg); err != nil { | ||||||
| return err | ||||||
| } | ||||||
| } else { | ||||||
| log.Debugf("key SkipAuditLogDatabase aleady exist in the db with value %v", val) | ||||||
|
There was a problem hiding this comment. Corrected spelling of 'aleady' to 'already' in the log message.
Suggested change
|
||||||
| } | ||||||
| return nil | ||||||
| } | ||||||
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix typo in the modified line.
The line contains a typo: "buld-package" should be "build-package". Since this line is being modified, please correct the typo.
Apply this diff to fix the typo:
📝 Committable suggestion
🤖 Prompt for AI Agents