Merge remote-tracking branch 'upstream/dev'

Author: EyalDelarea

.github/workflows/monitorIssues.yml

@@ -0,0 +1,35 @@
+name: Monitor Issues
+on:
+  workflow_dispatch:
+    inputs:
+      operations-per-run:
+        description: 'Number of operations per run'
+        required: false
+        default: '30'
+  schedule:
+    - cron: "0 0 * * *"  # Runs once a day at midnight
+jobs:
+  monitor-issues:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - uses: actions/stale@v9
+        with:
+          # Ignore issues with these labels
+          exempt-issue-labels: 'feature request,question'
+          # Days of inactivity before marking an issue as stale
+          days-before-issue-stale: 180
+          # Days of inactivity before closing an issue
+          days-before-issue-close: 7
+          # Name of the stale label
+          stale-issue-label: "stale"
+          stale-issue-message: "This issue has been marked as stale due to 6 months of inactivity. As part of our effort to address every issue properly, please feel free to remove the stale label or keep this issue active by leaving a comment. Otherwise, it will be closed in 7 days"
+          close-issue-message: "This issue was closed due to 7 days of inactivity after being marked as stale. Feel free to reopen it if it remains relevant."
+          # Ignore pull requests
+          days-before-pr-close: false
+          days-before-pr-stale: false
+          ascending: true
+          # Get from input or resolve to default
+          operations-per-run: ${{ github.event.inputs.operations-per-run || '30' }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

common/project/projectconfig.go

@@ -44,6 +44,7 @@ const (
 	Swift
 	Docker
 	Podman
+	Twine
 )
 
 type ConfigType string
@@ -71,6 +72,7 @@ var ProjectTypes = []string{
 	"swift",
 	"docker",
 	"podman",
+	"twine",
 }
 
 func (projectType ProjectType) String() string {

general/token/oidctokenexchange.go

@@ -1,6 +1,7 @@
 package token
 
 import (
+	"encoding/json"
 	"fmt"
 	rtUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
@@ -74,6 +75,11 @@ type OidcParams struct {
 	Repository     string
 }
 
+type ExchangeCommandOutputStruct struct {
+	AccessToken string `json:"AccessToken"`
+	Username    string `json:"Username"`
+}
+
 func NewOidcTokenExchangeCommand() *OidcTokenExchangeCommand {
 	return &OidcTokenExchangeCommand{response: new(auth.OidcTokenResponseData), OidcParams: &OidcParams{}}
 }
@@ -150,7 +156,16 @@ func (otc *OidcTokenExchangeCommand) SetProviderTypeAsString(providerType string
 }
 
 func (otc *OidcTokenExchangeCommand) PrintResponseToConsole() {
-	log.Output(fmt.Sprintf("{ AccessToken: %s Username: %s }", otc.response.AccessToken, otc.response.Username))
+	response := ExchangeCommandOutputStruct{
+		AccessToken: otc.response.AccessToken,
+		Username:    otc.response.Username,
+	}
+	jsonOutput, err := json.Marshal(response)
+	if err != nil {
+		log.Error("Failed to marshal response to JSON:", err)
+		return
+	}
+	log.Output(string(jsonOutput))
 }
 
 func (otc *OidcTokenExchangeCommand) Run() (err error) {