From f1d81988eea6792c7d2da1f0db1afe01447418a3 Mon Sep 17 00:00:00 2001 From: Carl George Date: Apr 30 2019 12:54:48 +0000 Subject: Latest upstream 0.9.1 --- diff --git a/Rename-TestClient_Auth-to-TestClient_IPs-and-mock-properly.patch b/Rename-TestClient_Auth-to-TestClient_IPs-and-mock-properly.patch deleted file mode 100644 index d64c2a7..0000000 --- a/Rename-TestClient_Auth-to-TestClient_IPs-and-mock-properly.patch +++ /dev/null @@ -1,121 +0,0 @@ -From b65fcb700f8eefb1890d13545f9b361a721272fd Mon Sep 17 00:00:00 2001 -From: Mihai Todor -Date: Tue, 13 Nov 2018 19:39:25 +0000 -Subject: [PATCH] Rename TestClient_Auth to TestClient_IPs and mock properly - (#231) - ---- - cloudflare_test.go | 25 ----------------- - ips_test.go | 67 ++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 67 insertions(+), 25 deletions(-) - create mode 100644 ips_test.go - -diff --git a/cloudflare_test.go b/cloudflare_test.go -index 872ace5..80ad841 100644 ---- a/cloudflare_test.go -+++ b/cloudflare_test.go -@@ -94,31 +94,6 @@ func TestClient_Headers(t *testing.T) { - teardown() - } - --func TestClient_Auth(t *testing.T) { -- setup() -- defer teardown() -- -- mux.HandleFunc("/ips", func(w http.ResponseWriter, r *http.Request) { -- assert.Equal(t, "GET", r.Method, "Expected method 'GET', got %s", r.Method) -- assert.Equal(t, "cloudflare@example.com", r.Header.Get("X-Auth-Email")) -- assert.Equal(t, "deadbeef", r.Header.Get("X-Auth-Token")) -- w.Header().Set("Content-Type", "application/json") -- fmt.Fprintf(w, `{ -- "success": true, -- "errors": [], -- "messages": [], -- "response": { -- "ipv4_cidrs": ["199.27.128.0/21"], -- "ipv6_cidrs": ["199.27.128.0/21"] -- } --}`) -- }) -- -- _, err := IPs() -- -- assert.NoError(t, err) --} -- - func TestClient_RetryCanSucceedAfterErrors(t *testing.T) { - setup(UsingRetryPolicy(2, 0, 1)) - defer teardown() -diff --git a/ips_test.go b/ips_test.go -new file mode 100644 -index 0000000..68b79e6 ---- /dev/null -+++ b/ips_test.go -@@ -0,0 +1,67 @@ -+package cloudflare -+ -+import ( -+ "fmt" -+ "net/http" -+ "net/http/httptest" -+ "net/url" -+ "testing" -+ -+ "github.com/stretchr/testify/assert" -+) -+ -+type MockTransport struct { -+ http.Transport -+ Server *httptest.Server -+ Path string -+} -+ -+func (m *MockTransport) RoundTrip(req *http.Request) (*http.Response, error) { -+ url, err := url.Parse(m.Server.URL + m.Path) -+ if err != nil { -+ return nil, err -+ } -+ -+ req.URL = url -+ -+ return m.Transport.RoundTrip(req) -+} -+ -+func Test_IPs(t *testing.T) { -+ setup() -+ defer teardown() -+ -+ mux := http.NewServeMux() -+ server = httptest.NewServer(mux) -+ defer server.Close() -+ -+ defaultTransport := http.DefaultTransport -+ http.DefaultTransport = &MockTransport{ -+ Server: server, -+ Path: "/ips", -+ } -+ defer func() { http.DefaultTransport = defaultTransport }() -+ -+ mux.HandleFunc("/ips", func(w http.ResponseWriter, r *http.Request) { -+ assert.Equal(t, "GET", r.Method, "Expected method 'GET', got %s", r.Method) -+ w.Header().Set("Content-Type", "application/json") -+ fmt.Fprintf(w, `{ -+ "success": true, -+ "errors": [], -+ "messages": [], -+ "result": { -+ "ipv4_cidrs": ["199.27.128.0/21"], -+ "ipv6_cidrs": ["ffff:ffff::/32"] -+ } -+}`) -+ }) -+ -+ ipRanges, err := IPs() -+ -+ assert.NoError(t, err) -+ -+ assert.Len(t, ipRanges.IPv4CIDRs, 1) -+ assert.Equal(t, "199.27.128.0/21", ipRanges.IPv4CIDRs[0]) -+ assert.Len(t, ipRanges.IPv6CIDRs, 1) -+ assert.Equal(t, "ffff:ffff::/32", ipRanges.IPv6CIDRs[0]) -+} diff --git a/golang-github-cloudflare.spec b/golang-github-cloudflare.spec index b0cb34a..cbb5b04 100644 --- a/golang-github-cloudflare.spec +++ b/golang-github-cloudflare.spec @@ -1,15 +1,13 @@ %global goipath github.com/cloudflare/cloudflare-go -Version: 0.8.5 +Version: 0.9.1 %gometa Name: %{goname} -Release: 2%{?dist} +Release: 1%{?dist} Summary: A Go library for interacting with Cloudflare's API v4 License: BSD URL: %{gourl} Source0: %{gosource} -# https://github.com/cloudflare/cloudflare-go/pull/231 -Patch0: Rename-TestClient_Auth-to-TestClient_IPs-and-mock-properly.patch BuildRequires: golang(github.com/codegangsta/cli) BuildRequires: golang(github.com/olekukonko/tablewriter) @@ -73,6 +71,9 @@ install -D -p -m 0755 _bin/flarectl %{buildroot}%{_bindir}/flarectl %changelog +* Tue Apr 30 2019 Carl George - 0.9.1-1 +- Latest upstream + * Thu Jan 31 2019 Fedora Release Engineering - 0.8.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 13da98c..5cb75d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cloudflare-go-0.8.5.tar.gz) = 622e535525364b16c72fc943a392693c33bfeeaeefec6463f95c480379801eb1184309f2a51efe4df47a1e6392f1ac43b2fdff5756ad2c44661be923808675fb +SHA512 (cloudflare-go-0.9.1.tar.gz) = 5f7f543c73d682d0a9b2a0d7e05a8c9ecf030300567d0dca723e524e6ee43bcaf4957338f4082dbc98ec8fd2aee7bd834562d2191ac18edf7fb42e5189625bb0