Compare commits

..

No commits in common. "eb574f9ad7e834f18d372b740d3f0e4bee8fcb8c" and "f2cc89736b5fe0e4e2ceb9d764fcd538fc6d3d43" have entirely different histories.

3 changed files with 7 additions and 7 deletions

View File

@ -100,12 +100,10 @@ func (c *Container) URI() string {
func (c *Container) SetURI(uri string) error {
resourceUri, e := url.Parse(uri)
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())
}
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 container.ListOptions) ([]types.Container, error) {
InjectContainerList: func(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error) {
return []types.Container{
{ID: "123456789abc"},
{ID: "123456789def"},

View File

@ -42,6 +42,8 @@ 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
}