Skip to content

temp: comment checkImageURL in order for oci images to pass #635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mac641 wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

temp: comment checkImageURL in order for oci images to pass #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8be8cad
chore(service): comment checkImageURL in order for oci images to pass
mac641 Dec 2, 2025
18176a8
Merge branch 'master' into oci-pull
mac641 Dec 2, 2025
5a91e52
test: comment image creation with broken url since it won't work with…
mac641 Dec 2, 2025
9988c37
Merge branch 'master' into oci-pull
mac641 Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions cmd/metal-api/internal/service/image-service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,11 +317,11 @@ func (r *imageResource) createImage(request *restful.Request, response *restful.
}
}

err = checkImageURL(requestPayload.ID, requestPayload.URL)
if err != nil {
r.sendError(request, response, httperrors.BadRequest(err))
return
}
// err = checkImageURL(requestPayload.ID, requestPayload.URL)
// if err != nil {
// r.sendError(request, response, httperrors.BadRequest(err))
// return
// }

img := &metal.Image{
Base: metal.Base{
Expand Down Expand Up @@ -411,11 +411,11 @@ func (r *imageResource) updateImage(request *restful.Request, response *restful.
newImage.Description = *requestPayload.Description
}
if requestPayload.URL != nil {
err = checkImageURL(requestPayload.ID, *requestPayload.URL)
if err != nil {
r.sendError(request, response, httperrors.BadRequest(err))
return
}
// err = checkImageURL(requestPayload.ID, *requestPayload.URL)
// if err != nil {
// r.sendError(request, response, httperrors.BadRequest(err))
// return
// }

newImage.URL = *requestPayload.URL
}
Expand Down
110 changes: 55 additions & 55 deletions cmd/metal-api/internal/service/image-service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,61 +149,61 @@ func TestCreateImage(t *testing.T) {
require.False(t, result.ExpirationDate.IsZero())
}

func TestCreateImageWithBrokenURL(t *testing.T) {
ds, mock := datastore.InitMockDB(t)
testdata.InitMockDBData(mock)
log := slog.Default()

createRequest := v1.ImageCreateRequest{
Common: v1.Common{
Identifiable: v1.Identifiable{
ID: testdata.Img1.ID,
},
Describable: v1.Describable{
Name: &testdata.Img1.Name,
Description: &testdata.Img1.Description,
},
},
URL: "http://this.domain.does.not.exist/",
}
js, err := json.Marshal(createRequest)
require.NoError(t, err)

body := bytes.NewBuffer(js)
req := httptest.NewRequest("PUT", "/v1/image", body)
container := injectAdmin(log, restful.NewContainer().Add(NewImage(log, ds)), req)
req.Header.Add("Content-Type", "application/json")
w := httptest.NewRecorder()
container.ServeHTTP(w, req)

resp := w.Result()
defer resp.Body.Close()
require.Equal(t, http.StatusBadRequest, resp.StatusCode, w.Body.String())
var result httperrors.HTTPErrorResponse
err = json.NewDecoder(resp.Body).Decode(&result)
require.NoError(t, err)
require.Contains(t, result.Message, "is not accessible under")

createRequest.URL = "http://images.metal-stack.io/this-file-does-not-exist"

js, err = json.Marshal(createRequest)
require.NoError(t, err)

body = bytes.NewBuffer(js)
req = httptest.NewRequest("PUT", "/v1/image", body)
container = injectAdmin(log, restful.NewContainer().Add(NewImage(log, ds)), req)
req.Header.Add("Content-Type", "application/json")
w = httptest.NewRecorder()
container.ServeHTTP(w, req)

resp = w.Result()
defer resp.Body.Close()
require.Equal(t, http.StatusBadRequest, resp.StatusCode, w.Body.String())

err = json.NewDecoder(resp.Body).Decode(&result)
require.NoError(t, err)
require.Equal(t, "image:image-1 is not accessible under:http://images.metal-stack.io/this-file-does-not-exist status:404 Not Found", result.Message)
}
// func TestCreateImageWithBrokenURL(t *testing.T) {
// ds, mock := datastore.InitMockDB(t)
// testdata.InitMockDBData(mock)
// log := slog.Default()
//
// createRequest := v1.ImageCreateRequest{
// Common: v1.Common{
// Identifiable: v1.Identifiable{
// ID: testdata.Img1.ID,
// },
// Describable: v1.Describable{
// Name: &testdata.Img1.Name,
// Description: &testdata.Img1.Description,
// },
// },
// URL: "http://this.domain.does.not.exist/",
// }
// js, err := json.Marshal(createRequest)
// require.NoError(t, err)
//
// body := bytes.NewBuffer(js)
// req := httptest.NewRequest("PUT", "/v1/image", body)
// container := injectAdmin(log, restful.NewContainer().Add(NewImage(log, ds)), req)
// req.Header.Add("Content-Type", "application/json")
// w := httptest.NewRecorder()
// container.ServeHTTP(w, req)
//
// resp := w.Result()
// defer resp.Body.Close()
// require.Equal(t, http.StatusBadRequest, resp.StatusCode, w.Body.String())
// var result httperrors.HTTPErrorResponse
// err = json.NewDecoder(resp.Body).Decode(&result)
// require.NoError(t, err)
// require.Contains(t, result.Message, "is not accessible under")
//
// createRequest.URL = "http://images.metal-stack.io/this-file-does-not-exist"
//
// js, err = json.Marshal(createRequest)
// require.NoError(t, err)
//
// body = bytes.NewBuffer(js)
// req = httptest.NewRequest("PUT", "/v1/image", body)
// container = injectAdmin(log, restful.NewContainer().Add(NewImage(log, ds)), req)
// req.Header.Add("Content-Type", "application/json")
// w = httptest.NewRecorder()
// container.ServeHTTP(w, req)
//
// resp = w.Result()
// defer resp.Body.Close()
// require.Equal(t, http.StatusBadRequest, resp.StatusCode, w.Body.String())
//
// err = json.NewDecoder(resp.Body).Decode(&result)
// require.NoError(t, err)
// require.Equal(t, "image:image-1 is not accessible under:http://images.metal-stack.io/this-file-does-not-exist status:404 Not Found", result.Message)
// }

func TestCreateImageWithClassification(t *testing.T) {
ds, mock := datastore.InitMockDB(t)
Expand Down