diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2019-11-26 17:25:35 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2019-11-26 17:25:35 +0300 |
commit | f7d89e372df5d4c59c1a175bb807578f4350391b (patch) | |
tree | cec57531a1ccbb023bdc2adf907ac4035e2ee9bf | |
parent | 204b225d2308a61586ad7557d1f2f86bebfe73e6 (diff) |
Rename package that holds GitLab API response types
-rw-r--r-- | internal/source/gitlab/api/lookup_path.go (renamed from internal/source/gitlab/domain/lookup_path.go) | 2 | ||||
-rw-r--r-- | internal/source/gitlab/api/virtual_domain.go (renamed from internal/source/gitlab/domain/virtual_domain.go) | 4 | ||||
-rw-r--r-- | internal/source/gitlab/client.go | 4 | ||||
-rw-r--r-- | internal/source/gitlab/client/client.go | 6 | ||||
-rw-r--r-- | internal/source/gitlab/client/client_stub.go | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/internal/source/gitlab/domain/lookup_path.go b/internal/source/gitlab/api/lookup_path.go index 7ce91608..b0407638 100644 --- a/internal/source/gitlab/domain/lookup_path.go +++ b/internal/source/gitlab/api/lookup_path.go @@ -1,4 +1,4 @@ -package domain +package api // LookupPath represents a lookup path for a virtual domain type LookupPath struct { diff --git a/internal/source/gitlab/domain/virtual_domain.go b/internal/source/gitlab/api/virtual_domain.go index 9a1c17cc..200c06de 100644 --- a/internal/source/gitlab/domain/virtual_domain.go +++ b/internal/source/gitlab/api/virtual_domain.go @@ -1,7 +1,7 @@ -package domain +package api // VirtualDomain represents a GitLab Pages virtual domain that is being sent -// from GitLab +// from GitLab API type VirtualDomain struct { Certificate string `json:"certificate,omitempty"` Key string `json:"key,omitempty"` diff --git a/internal/source/gitlab/client.go b/internal/source/gitlab/client.go index 1485fc25..5b6cd07c 100644 --- a/internal/source/gitlab/client.go +++ b/internal/source/gitlab/client.go @@ -1,10 +1,10 @@ package gitlab -import "gitlab.com/gitlab-org/gitlab-pages/internal/source/gitlab/domain" +import "gitlab.com/gitlab-org/gitlab-pages/internal/source/gitlab/api" // Client interace represents a client capable of fetching a virtual domain // from an external API type Client interface { // GetVirtualDomain retrieves a virtual domain from an external API - GetVirtualDomain(host string) (*domain.VirtualDomain, error) + GetVirtualDomain(host string) (*api.VirtualDomain, error) } diff --git a/internal/source/gitlab/client/client.go b/internal/source/gitlab/client/client.go index 43cc84bf..b6a7b059 100644 --- a/internal/source/gitlab/client/client.go +++ b/internal/source/gitlab/client/client.go @@ -12,7 +12,7 @@ import ( "gitlab.com/gitlab-org/labkit/log" "gitlab.com/gitlab-org/gitlab-pages/internal/httptransport" - "gitlab.com/gitlab-org/gitlab-pages/internal/source/gitlab/domain" + "gitlab.com/gitlab-org/gitlab-pages/internal/source/gitlab/api" ) // Client is a HTTP client to access Pages internal API @@ -52,7 +52,7 @@ func NewFromConfig(config Config) *Client { } // GetVirtualDomain returns VirtualDomain configuration for the given host -func (gc *Client) GetVirtualDomain(host string) (*domain.VirtualDomain, error) { +func (gc *Client) GetVirtualDomain(host string) (*api.VirtualDomain, error) { params := map[string]string{"host": host} resp, err := gc.get("/api/v4/internal/pages", params) @@ -61,7 +61,7 @@ func (gc *Client) GetVirtualDomain(host string) (*domain.VirtualDomain, error) { } defer resp.Body.Close() - var domain domain.VirtualDomain + var domain api.VirtualDomain err = json.NewDecoder(resp.Body).Decode(&domain) if err != nil { return nil, err diff --git a/internal/source/gitlab/client/client_stub.go b/internal/source/gitlab/client/client_stub.go index 48dbf549..0e24fe7f 100644 --- a/internal/source/gitlab/client/client_stub.go +++ b/internal/source/gitlab/client/client_stub.go @@ -4,7 +4,7 @@ import ( "encoding/json" "os" - "gitlab.com/gitlab-org/gitlab-pages/internal/source/gitlab/domain" + "gitlab.com/gitlab-org/gitlab-pages/internal/source/gitlab/api" ) // StubClient is a stubbed client used for testing @@ -13,7 +13,7 @@ type StubClient struct { } // GetVirtualDomain reads a test fixture and unmarshalls it -func (m *StubClient) GetVirtualDomain(host string) (domain *domain.VirtualDomain, err error) { +func (m *StubClient) GetVirtualDomain(host string) (domain *api.VirtualDomain, err error) { f, err := os.Open(m.file) defer f.Close() if err != nil { |