Merge remote-tracking branch 'upstream/dev'

Author: EyalDelarea

README.md

@@ -257,6 +257,13 @@
       - [Creating New Metadata Service Manager](#creating-new-metadata-service-manager)
     - [Using Metadata Services](#using-metadata-services)
       - [Graphql query](#graphql-query)
+    - [Onemodel APIs](#onemodel-apis)
+      - [Creating Onemodel Service Manager](#creating-onemodel-service-manager)
+        - [Creating Onemodel Details](#creating-onemodel-details)
+        - [Creating Onemodel Service Config](#creating-onemodel-service-config)
+        - [Creating New Onemodel Service Manager](#creating-new-onemodel-service-manager)
+    - [Using Onemodel Services](#using-onemodel-services)
+      - [Graphql query](#graphql-query)
 
 ## General
 
@@ -3134,4 +3141,49 @@ queryDetails := metadataService.QueryDetails{
 }
 
 body, err = metadataManager.GraphqlQuery(queryDetails)
+```
+## Onemodel APIs
+
+### Creating Onemodel Service Manager
+
+#### Creating Onemodel Details
+
+```go
+omDetails := auth.NewOnemodelDetails()
+omDetails.SetUrl("http://localhost:8081/onemodel")
+omDetails.SetAccessToken("access-token")
+// if client certificates are required
+omDetails.SetClientCertPath("path/to/.cer")
+omDetails.SetClientCertKeyPath("path/to/.key")
+```
+
+#### Creating Onemodel Service Config
+
+```go
+serviceConfig, err := config.NewConfigBuilder().
+    SetServiceDetails(omDetails).
+    SetCertificatesPath(omDetails.GetClientCertPath()).
+    // Optionally overwrite the default HTTP retries, which is set to 3.
+    SetHttpRetries(3).
+    Build()
+```
+
+#### Creating New Onemodel Service Manager
+
+```go
+onemodelManager, err := onemodel.NewManager(serviceConfig)
+```
+
+### Using Onemodel Services
+
+#### Graphql query
+
+```go
+queryBytes := []byte(`{"query":"someGraphqlQuery"}`)
+
+queryDetails := onemodelService.QueryDetails{
+  Body:  queryBytes,
+}
+
+body, err = onemodelManager.GraphqlQuery(queryDetails)
 ```

access/services/accesstoken.go

@@ -43,6 +43,7 @@ type CreateOidcTokenParams struct {
 	Repo                  string `json:"repo,omitempty"`
 	ApplicationKey        string `json:"application_key,omitempty"`
 	Audience              string `json:"audience,omitempty"`
+	ProviderType          string `json:"provider_type,omitempty"`
 	IdentityMappingName   string `json:"identity_mapping_name,omitempty"`
 	IncludeReferenceToken *bool  `json:"include_reference_token,omitempty"`
 }

artifactory/services/promote.go

@@ -8,7 +8,6 @@ import (
 	"github.com/jfrog/jfrog-client-go/artifactory/services/utils"
 	"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"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 )
@@ -35,17 +34,21 @@ func (ps *PromoteService) BuildPromote(promotionParams PromotionParams) error {
 	log.Info(message)
 
 	promoteUrl := ps.ArtDetails.GetUrl()
-	restApi := path.Join("api/build/promote/", promotionParams.GetBuildName(), promotionParams.GetBuildNumber())
+	restApi := path.Join("api/build/promote/")
 
 	queryParams := make(map[string]string)
 	if promotionParams.ProjectKey != "" {
 		queryParams["project"] = promotionParams.ProjectKey
 	}
 
-	requestFullUrl, err := clientutils.BuildUrl(promoteUrl, restApi, queryParams)
+	buildName := promotionParams.GetBuildName()
+	buildNumber := promotionParams.GetBuildNumber()
+
+	requestURLWithEscapedSlash, err := utils.BuildUrlWithEscapingSlash(promoteUrl, restApi, buildName, buildNumber, queryParams)
 	if err != nil {
 		return err
 	}
+
 	props, err := utils.ParseProperties(promotionParams.GetProperties())
 	if err != nil {
 		return err
@@ -69,11 +72,11 @@ func (ps *PromoteService) BuildPromote(promotionParams PromotionParams) error {
 	httpClientsDetails := ps.ArtDetails.CreateHttpClientDetails()
 	utils.SetContentType("application/vnd.org.jfrog.artifactory.build.PromotionRequest+json", &httpClientsDetails.Headers)
 
-	resp, body, err := ps.client.SendPost(requestFullUrl, requestContent, &httpClientsDetails)
+	resp, body, err := ps.client.SendPost(requestURLWithEscapedSlash, requestContent, &httpClientsDetails)
 	if err != nil {
 		return err
 	}
-
+	
 	if err = errorutils.CheckResponseStatusWithBody(resp, body, http.StatusOK); err != nil {
 		return err
 	}

artifactory/services/utils/buildUrlWithEscapingSlash.go

@@ -0,0 +1,34 @@
+package utils
+
+import (
+	"net/url"
+	"path"
+	"strings"
+
+	"github.com/jfrog/jfrog-client-go/utils/errorutils"
+)
+
+func BuildUrlWithEscapingSlash(baseUrl, restApi, buildName, buildNumber string, queryParams map[string]string) (string, error) {
+	u := url.URL{Path: restApi}
+	parsedUrl, err := url.Parse(baseUrl + u.String())
+	if err = errorutils.CheckError(err); err != nil {
+		return "", err
+	}
+	q := parsedUrl.Query()
+	for k, v := range queryParams {
+		q.Set(k, v)
+	}
+	parsedUrl.RawQuery = q.Encode()
+
+	// Semicolons are reserved as separators in some Artifactory APIs, so they'd better be encoded when used for other purposes
+	encodedUrl := strings.ReplaceAll(parsedUrl.String(), ";", url.QueryEscape(";"))
+
+	escapedBuildPath := path.Join(url.QueryEscape(buildName), url.QueryEscape(buildNumber))
+	urlParts := strings.Split(encodedUrl, "?")
+	resultUrl := urlParts[0] + "/" + escapedBuildPath
+	if len(urlParts) > 1 && urlParts[1] != "" {
+		resultUrl += "?" + urlParts[1]
+	}
+
+	return resultUrl, nil
+}

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/golang-jwt/jwt/v4 v4.5.2
 	github.com/gookit/color v1.5.4
 	github.com/jfrog/archiver/v3 v3.6.1
-	github.com/jfrog/build-info-go v1.10.12
+	github.com/jfrog/build-info-go v1.10.13
 	github.com/jfrog/gofrog v1.7.6
 	github.com/minio/sha256-simd v1.0.1
 	github.com/stretchr/testify v1.10.0
@@ -25,7 +25,7 @@ require (
 	github.com/CycloneDX/cyclonedx-go v0.9.2 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/andybalholm/brotli v1.1.1 // indirect
-	github.com/cloudflare/circl v1.6.0 // indirect
+	github.com/cloudflare/circl v1.6.1 // indirect
 	github.com/cyphar/filepath-securejoin v0.4.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dsnet/compress v0.0.1 // indirect

go.sum

@@ -17,8 +17,8 @@ github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oM
 github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0=
 github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
-github.com/cloudflare/circl v1.6.0 h1:cr5JKic4HI+LkINy2lg3W2jF8sHCVTBncJr5gIIq7qk=
-github.com/cloudflare/circl v1.6.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
+github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
+github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
 github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
 github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -57,8 +57,8 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOl
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI=
 github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw=
-github.com/jfrog/build-info-go v1.10.12 h1:KO/YUeKYtDrnpcmsXmwqr6akjzrwA0hSTUB+Op/HF88=
-github.com/jfrog/build-info-go v1.10.12/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE=
+github.com/jfrog/build-info-go v1.10.13 h1:gWx4e99aRGb3VdMQ9DIE0MN7Orevkif6WtBGfN6uVNg=
+github.com/jfrog/build-info-go v1.10.13/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE=
 github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s=
 github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=

onemodel/auth/onemodeldetails.go

@@ -0,0 +1,17 @@
+package auth
+
+import (
+	"github.com/jfrog/jfrog-client-go/auth"
+)
+
+type onemodelDetails struct {
+	auth.CommonConfigFields
+}
+
+func NewOnemodelDetails() auth.ServiceDetails {
+	return &onemodelDetails{}
+}
+
+func (rt *onemodelDetails) GetVersion() (string, error) {
+	panic("Failed: Method is not implemented")
+}

onemodel/manager.go

@@ -0,0 +1,45 @@
+package onemodel
+
+import (
+	"github.com/jfrog/jfrog-client-go/config"
+	"github.com/jfrog/jfrog-client-go/http/jfroghttpclient"
+	"github.com/jfrog/jfrog-client-go/onemodel/services"
+)
+
+type Manager interface {
+	GraphqlQuery(query []byte) ([]byte, error)
+}
+
+type onemodelManager struct {
+	client *jfroghttpclient.JfrogHttpClient
+	config config.Config
+}
+
+func NewManager(config config.Config) (Manager, error) {
+	details := config.GetServiceDetails()
+	var err error
+	manager := &onemodelManager{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 (omm *onemodelManager) Client() *jfroghttpclient.JfrogHttpClient {
+	return omm.client
+}
+
+func (omm *onemodelManager) GraphqlQuery(query []byte) ([]byte, error) {
+	onemodelService := services.NewOnemodelService(omm.config.GetServiceDetails(), omm.client)
+	return onemodelService.Query(query)
+}

onemodel/services/graphql.go

@@ -0,0 +1,46 @@
+package services
+
+import (
+	"fmt"
+	"net/http"
+	"net/url"
+
+	rtUtils "github.com/jfrog/jfrog-client-go/artifactory/services/utils"
+	"github.com/jfrog/jfrog-client-go/auth"
+	"github.com/jfrog/jfrog-client-go/http/jfroghttpclient"
+	"github.com/jfrog/jfrog-client-go/utils/errorutils"
+)
+
+const queryUrl = "api/v1/graphql"
+
+type Service interface {
+	Query(query []byte) ([]byte, error)
+}
+
+type onemodelService struct {
+	client         *jfroghttpclient.JfrogHttpClient
+	serviceDetails *auth.ServiceDetails
+}
+
+func NewOnemodelService(serviceDetails auth.ServiceDetails, client *jfroghttpclient.JfrogHttpClient) Service {
+	return &onemodelService{serviceDetails: &serviceDetails, client: client}
+}
+
+func (m *onemodelService) GetOnemodelDetails() auth.ServiceDetails {
+	return *m.serviceDetails
+}
+
+func (m *onemodelService) Query(query []byte) ([]byte, error) {
+	graphqlUrl, err := url.Parse(m.GetOnemodelDetails().GetUrl() + queryUrl)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse URL: %w", err)
+	}
+	httpClientDetails := m.GetOnemodelDetails().CreateHttpClientDetails()
+	rtUtils.SetContentType("application/json", &httpClientDetails.Headers)
+
+	resp, body, err := m.client.SendPost(graphqlUrl.String(), query, &httpClientDetails)
+	if err != nil {
+		return []byte{}, err
+	}
+	return body, errorutils.CheckResponseStatusWithBody(resp, body, http.StatusOK)
+}

onemodel/services/graphql_test.go

@@ -0,0 +1,56 @@
+package services
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/jfrog/jfrog-client-go/artifactory/auth"
+	"github.com/jfrog/jfrog-client-go/http/jfroghttpclient"
+	"github.com/stretchr/testify/assert"
+)
+
+const queryData = `{"query":"someGraphqlQuery"}`
+
+func TestOnemodelService_Query(t *testing.T) {
+	handlerFunc, requestNum := createOnemodelHandlerFunc(t)
+
+	mockServer, onemodelService := createMockonemodelServer(t, handlerFunc)
+	defer mockServer.Close()
+
+	_, err := onemodelService.Query([]byte(queryData))
+	assert.NoError(t, err)
+	assert.Equal(t, 1, *requestNum)
+}
+
+func createMockonemodelServer(t *testing.T, testHandler http.HandlerFunc) (*httptest.Server, *onemodelService) {
+	testServer := httptest.NewServer(testHandler)
+
+	serviceDetails := auth.NewArtifactoryDetails()
+	serviceDetails.SetUrl(testServer.URL + "/")
+
+	client, err := jfroghttpclient.JfrogClientBuilder().Build()
+	assert.NoError(t, err)
+	return testServer, &onemodelService{serviceDetails: &serviceDetails, client: client}
+}
+
+func createOnemodelHandlerFunc(t *testing.T) (http.HandlerFunc, *int) {
+	requestNum := 0
+	return func(w http.ResponseWriter, r *http.Request) {
+		if r.RequestURI == "/api/v1/graphql" {
+			assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
+
+			w.WriteHeader(http.StatusOK)
+			requestNum++
+			writeMockonemodelResponse(t, w, []byte(queryData))
+		}
+	}, &requestNum
+}
+
+func writeMockonemodelResponse(t *testing.T, w http.ResponseWriter, payload []byte) {
+	content, err := json.Marshal(payload)
+	assert.NoError(t, err)
+	_, err = w.Write(content)
+	assert.NoError(t, err)
+}