-
Notifications
You must be signed in to change notification settings - Fork 142
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into frogbot-golang.org/x/net-13b661a2386933d18e2c…
…3167e5761c88
- Loading branch information
Showing
24 changed files
with
510 additions
and
127 deletions.
There are no files selected for viewing
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
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
File renamed without changes.
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package auth | ||
|
|
||
| import ( | ||
| "github.com/jfrog/jfrog-client-go/auth" | ||
| ) | ||
|
|
||
| func NewJfConnectDetails() auth.ServiceDetails { | ||
| return &jfConnectDetails{} | ||
| } | ||
|
|
||
| type jfConnectDetails struct { | ||
| auth.CommonConfigFields | ||
| } | ||
|
|
||
| func (jc *jfConnectDetails) GetVersion() (string, error) { | ||
| panic("Failed: Method is not implemented") | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| package jfconnect | ||
|
|
||
| import ( | ||
| "github.com/jfrog/jfrog-client-go/config" | ||
| "github.com/jfrog/jfrog-client-go/http/jfroghttpclient" | ||
| "github.com/jfrog/jfrog-client-go/jfconnect/services" | ||
| ) | ||
|
|
||
| type Manager interface { | ||
| PostVisibilityMetric(services.VisibilityMetric) error | ||
| } | ||
|
|
||
| type jfConnectManager struct { | ||
| client *jfroghttpclient.JfrogHttpClient | ||
| config config.Config | ||
| } | ||
|
|
||
| func NewManager(config config.Config) (Manager, error) { | ||
| details := config.GetServiceDetails() | ||
| var err error | ||
| manager := &jfConnectManager{config: config} | ||
| manager.client, err = jfroghttpclient.JfrogClientBuilder(). | ||
| SetCertificatesPath(config.GetCertificatesPath()). | ||
| SetInsecureTls(config.IsInsecureTls()). | ||
| SetClientCertPath(details.GetClientCertPath()). | ||
| SetClientCertKeyPath(details.GetClientCertKeyPath()). | ||
| AppendPreRequestInterceptor(details.RunPreRequestFunctions). | ||
| SetContext(config.GetContext()). | ||
| SetDialTimeout(config.GetDialTimeout()). | ||
| SetOverallRequestTimeout(config.GetOverallRequestTimeout()). | ||
| SetRetries(config.GetHttpRetries()). | ||
| SetRetryWaitMilliSecs(config.GetHttpRetryWaitMilliSecs()). | ||
| Build() | ||
|
|
||
| return manager, err | ||
| } | ||
|
|
||
| func (jm *jfConnectManager) Client() *jfroghttpclient.JfrogHttpClient { | ||
| return jm.client | ||
| } | ||
|
|
||
| func (jm *jfConnectManager) PostVisibilityMetric(metric services.VisibilityMetric) error { | ||
| jfConnectService := services.NewJfConnectService(jm.config.GetServiceDetails(), jm.client) | ||
| return jfConnectService.PostVisibilityMetric(metric) | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| package services | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "net/http" | ||
|
|
||
| "github.com/jfrog/jfrog-client-go/auth" | ||
| "github.com/jfrog/jfrog-client-go/http/jfroghttpclient" | ||
| clientutils "github.com/jfrog/jfrog-client-go/utils" | ||
| "github.com/jfrog/jfrog-client-go/utils/errorutils" | ||
| ) | ||
|
|
||
| const LogMetricApiEndpoint = "api/v1/backoffice/metrics/log" | ||
|
|
||
| type JfConnectService struct { | ||
| client *jfroghttpclient.JfrogHttpClient | ||
| serviceDetails *auth.ServiceDetails | ||
| } | ||
|
|
||
| func NewJfConnectService(serviceDetails auth.ServiceDetails, client *jfroghttpclient.JfrogHttpClient) *JfConnectService { | ||
| return &JfConnectService{serviceDetails: &serviceDetails, client: client} | ||
| } | ||
|
|
||
| func (jcs *JfConnectService) GetJfConnectDetails() auth.ServiceDetails { | ||
| return *jcs.serviceDetails | ||
| } | ||
|
|
||
| func (jcs *JfConnectService) PostVisibilityMetric(metric VisibilityMetric) error { | ||
| metricJson, err := json.Marshal(metric) | ||
| if err != nil { | ||
| return errorutils.CheckError(err) | ||
| } | ||
| details := jcs.GetJfConnectDetails() | ||
| httpClientDetails := details.CreateHttpClientDetails() | ||
| httpClientDetails.SetContentTypeApplicationJson() | ||
|
|
||
| url := clientutils.AddTrailingSlashIfNeeded(details.GetUrl()) | ||
| url += LogMetricApiEndpoint | ||
| resp, body, err := jcs.client.SendPost(url, metricJson, &httpClientDetails) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return errorutils.CheckResponseStatusWithBody(resp, body, http.StatusCreated, http.StatusOK) | ||
| } | ||
|
|
||
| type Labels struct { | ||
| ProductID string `json:"product_id"` | ||
| ProductVersion string `json:"product_version"` | ||
| FeatureID string `json:"feature_id"` | ||
| OIDCUsed string `json:"oidc_used"` | ||
| JobID string `json:"job_id"` | ||
| RunID string `json:"run_id"` | ||
| GitRepo string `json:"git_repo"` | ||
| GhTokenForCodeScanningAlertsProvided string `json:"gh_token_for_code_scanning_alerts_provided"` | ||
| } | ||
|
|
||
| type VisibilityMetric struct { | ||
| Value int `json:"value"` | ||
| MetricsName string `json:"metrics_name"` | ||
| Labels Labels `json:"labels"` | ||
| } |
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
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
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
Oops, something went wrong.