Skip to content

Commit 4c3f86c

Browse files
authored
Merge pull request #275 from Azure/s2s-enhanced-support
S2S enhanced supports
2 parents 0755f7e + ec811c0 commit 4c3f86c

File tree

84 files changed

+7660
-1899
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+7660
-1899
lines changed

Gopkg.lock

+139-21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

+29-5
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
name = "github.com/Azure/azure-pipeline-go"
33
version = "0.1.8"
44

5-
[[constraint]]
6-
name = "github.com/Azure/azure-storage-blob-go"
7-
version = "0.5.0"
8-
95
[[constraint]]
106
name = "github.com/Azure/azure-storage-file-go"
117
version = "0.4.1"
@@ -28,7 +24,11 @@
2824

2925
[[constraint]]
3026
name = "github.com/jiacfan/keyctl"
31-
version = "0.1.0"
27+
version = "0.2.0"
28+
29+
[[constraint]]
30+
name = "github.com/minio/minio-go"
31+
version = "6.0.12"
3232

3333
[[constraint]]
3434
name = "github.com/spf13/cobra"
@@ -45,3 +45,27 @@
4545
[prune]
4646
go-tests = true
4747
unused-packages = true
48+
49+
[[constraint]]
50+
name = "github.com/dgrijalva/jwt-go"
51+
version = "3.2.0"
52+
53+
[[constraint]]
54+
name = "github.com/go-ini/ini"
55+
version = "1.42.0"
56+
57+
[[constraint]]
58+
name = "github.com/inconshreveable/mousetrap"
59+
version = "1.0.0"
60+
61+
[[constraint]]
62+
name = "github.com/kr/pretty"
63+
version = "0.1.0"
64+
65+
[[constraint]]
66+
name = "github.com/stretchr/testify"
67+
version = "1.3.0"
68+
69+
[[constraint]]
70+
branch = "dev"
71+
name = "github.com/Azure/azure-storage-blob-go"

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dep: docker-build #
2323
setup: clean docker-build dep ## setup environment for development
2424

2525
test: setup ## run go tests
26-
ACCOUNT_NAME=$(ACCOUNT_NAME) ACCOUNT_KEY=$(ACCOUNT_KEY) $(call with_docker,go test -race -short -cover ./cmd ./ste ./azbfs, -e ACCOUNT_NAME -e ACCOUNT_KEY)
26+
ACCOUNT_NAME=$(ACCOUNT_NAME) ACCOUNT_KEY=$(ACCOUNT_KEY) AWS_ACCESS_KEY_ID=$(AWS_ACCESS_KEY_ID) AWS_SECRET_ACCESS_KEY=$(AWS_SECRET_ACCESS_KEY) $(call with_docker,go test -race -short -cover ./cmd ./common ./ste ./azbfs, -e ACCOUNT_NAME -e ACCOUNT_KEY -e AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY)
2727

2828
build: setup ## build binaries for the project
2929
# the environment variables need to be passed into the container explicitly

0 commit comments

Comments
 (0)