Compare commits

...

2 Commits

Author SHA1 Message Date
eb574f9ad7 fix linting errors
Some checks failed
Lint / golangci-lint (push) Failing after 10m19s
Declarative Tests / test (push) Failing after 1m1s
2024-04-03 15:58:29 -07:00
9ed42521c8 fix linting errors 2024-04-03 15:54:42 -07:00
3 changed files with 7 additions and 7 deletions

View File

@ -100,10 +100,12 @@ func (c *Container) URI() string {
func (c *Container) SetURI(uri string) error {
resourceUri, e := url.Parse(uri)
if resourceUri.Scheme == c.Type() {
c.Name, e = filepath.Abs(filepath.Join(resourceUri.Hostname(), resourceUri.RequestURI()))
} else {
e = fmt.Errorf("%w: %s is not a %s", ErrInvalidResourceURI, uri, c.Type())
if e == nil {
if resourceUri.Scheme == c.Type() {
c.Name, e = filepath.Abs(filepath.Join(resourceUri.Hostname(), resourceUri.RequestURI()))
} else {
e = fmt.Errorf("%w: %s is not a %s", ErrInvalidResourceURI, uri, c.Type())
}
}
return e
}

View File

@ -34,7 +34,7 @@ func TestReadContainer(t *testing.T) {
state: present
`
m := &mocks.MockContainerClient{
InjectContainerList: func(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error) {
InjectContainerList: func(ctx context.Context, options container.ListOptions) ([]types.Container, error) {
return []types.Container{
{ID: "123456789abc"},
{ID: "123456789def"},

View File

@ -42,8 +42,6 @@ func (m *MockResource) Type() string {
}
func (m *MockResource) UnmarshalJSON(data []byte) error {
fmt.Printf("UnmarshalJSON %#v\n", string(data))
panic(data)
if err := json.Unmarshal(data, m); err != nil {
return err
}