Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions common/spec/distributionrules.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ type DistributionRule struct {
SiteName string `json:"site_name,omitempty"`
CityName string `json:"city_name,omitempty"`
CountryCodes []string `json:"country_codes,omitempty"`
Priority string `json:"priority,omitempty"`
}

func (distributionRules *DistributionRules) Get(index int) *DistributionRule {
Expand All @@ -30,6 +31,7 @@ func (distributionRule *DistributionRule) ToDistributionCommonParams() *distribu
SiteName: distributionRule.SiteName,
CityName: distributionRule.CityName,
CountryCodes: distributionRule.CountryCodes,
Priority: distributionRule.Priority,
}
}

Expand Down
47 changes: 47 additions & 0 deletions common/spec/distributionrules_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package spec

import (
"os"
"path/filepath"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestToDistributionCommonParamsIncludesPriority(t *testing.T) {
rule := DistributionRule{
SiteName: "edge1",
CityName: "Tel Aviv",
CountryCodes: []string{"IL"},
Priority: "high",
}

params := rule.ToDistributionCommonParams()
require.NotNil(t, params)
assert.Equal(t, "edge1", params.SiteName)
assert.Equal(t, "Tel Aviv", params.CityName)
assert.Equal(t, []string{"IL"}, params.CountryCodes)
assert.Equal(t, "high", params.Priority)
}

func TestCreateDistributionRulesFromFileParsesPriority(t *testing.T) {
dir := t.TempDir()
path := filepath.Join(dir, "rules.json")
content := `{
"distribution_rules": [
{
"site_name": "edge*",
"priority": "medium"
}
]
}`
require.NoError(t, os.WriteFile(path, []byte(content), 0o644))

rules, err := CreateDistributionRulesFromFile(path)
require.NoError(t, err)
require.Len(t, rules.DistributionRules, 1)
assert.Equal(t, "edge*", rules.DistributionRules[0].SiteName)
assert.Equal(t, "medium", rules.DistributionRules[0].Priority)
assert.Equal(t, "medium", rules.DistributionRules[0].ToDistributionCommonParams().Priority)
}
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
github.com/jedib0t/go-pretty/v6 v6.8.3
github.com/jfrog/build-info-go v1.13.1-0.20260429070557-93b98034d295
github.com/jfrog/gofrog v1.7.6
github.com/jfrog/jfrog-client-go v1.55.1-0.20260813100550-0f2168d02558
github.com/jfrog/jfrog-client-go v1.55.1-0.20260827094947-e7a90ebc8049
github.com/magiconair/properties v1.18.11
github.com/manifoldco/promptui v0.9.0
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ github.com/jfrog/build-info-go v1.13.1-0.20260429070557-93b98034d295 h1:EH0h86Kw
github.com/jfrog/build-info-go v1.13.1-0.20260429070557-93b98034d295/go.mod h1:+OCtMb22/D+u7Wne5lzkjJjaWr0LRZcHlDwTH86Mpwo=
github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s=
github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4=
github.com/jfrog/jfrog-client-go v1.55.1-0.20260813100550-0f2168d02558 h1:/4ayHXxzgyZ9f66EqImCyZr2SKUpygU1P36sDVAlskM=
github.com/jfrog/jfrog-client-go v1.55.1-0.20260813100550-0f2168d02558/go.mod h1:7B7eMRKuMhZ0rOdMItbJVpWjRUe1L//J3Jq+PgjiNxI=
github.com/jfrog/jfrog-client-go v1.55.1-0.20260827094947-e7a90ebc8049 h1:eogwWAzZFir1suYEgZ4ZrYrch8fhWs7ma2dxv06p/z8=
github.com/jfrog/jfrog-client-go v1.55.1-0.20260827094947-e7a90ebc8049/go.mod h1:7B7eMRKuMhZ0rOdMItbJVpWjRUe1L//J3Jq+PgjiNxI=
github.com/kevinburke/ssh_config v1.6.0 h1:J1FBfmuVosPHf5GRdltRLhPJtJpTlMdKTBjRgTaQBFY=
github.com/kevinburke/ssh_config v1.6.0/go.mod h1:q2RIzfka+BXARoNexmF9gkxEX7DmvbW9P4hIVx2Kg4M=
github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
Expand Down
Loading