Add initial triplestore rebuild functionality

internal/dis/component/triplestore/database.go

@@ -31,43 +31,71 @@ type TriplestoreUserAppSettings struct {
 // This includes e.g. CRUDing a specific repo.
 const tsTrivialTimeout = time.Minute
 
-// OpenRaw makes an http request to the triplestore api.
-//
-// When bodyName is non-empty, expect body to be a byte slice representing a multipart/form-data upload with the given name.
-// When bodyName is empty, simply marshal body as application/json
-func (ts Triplestore) OpenRaw(ctx context.Context, method, url string, body any, bodyName string, accept string, timeout time.Duration) (*http.Response, error) {
-	var reader io.Reader   // to read the body from
-	var contentType string // content-type of the request being sent
+// RequestHeaders represent headers of a raw http request
+type RequestHeaders struct {
+	Accept      string
+	ContentType string
+}
 
-	// for "PUT" and "POST" we setup a body
-	if method == http.MethodPut || method == http.MethodPost {
-		if bodyName != "" {
-			var buffer bytes.Buffer
+func (rh *RequestHeaders) With(headers RequestHeaders) *RequestHeaders {
 
-			// write the file to it
-			writer := multipart.NewWriter(&buffer)
-			{
-				part, err := writer.CreateFormFile(bodyName, "filename.txt")
-				if err != nil {
-					return nil, err
-				}
-				io.Copy(part, bytes.NewReader(body.([]byte)))
-			}
-			writer.Close()
-
-			// use it for the request
-			reader = &buffer
-			contentType = writer.FormDataContentType()
-		} else {
-			mbytes, err := json.Marshal(body)
-			if err != nil {
-				return nil, err
-			}
-			reader = bytes.NewReader(mbytes)
-			contentType = "application/json"
-		}
+	// create new request headers and copy the old options
+	var newHeaders RequestHeaders
+	if rh != nil {
+		newHeaders = *rh
 	}
 
+	// add the options
+	if headers.Accept != "" {
+		newHeaders.Accept = headers.Accept
+	}
+
+	if headers.ContentType != "" {
+		newHeaders.ContentType = headers.ContentType
+	}
+
+	return &newHeaders
+}
+
+// DoRest performs a (raw) http request to the without a body.
+func (ts Triplestore) DoRest(ctx context.Context, timeout time.Duration, method, url string, headers *RequestHeaders) (*http.Response, error) {
+	return ts.DoRestWithReader(ctx, timeout, method, url, headers, nil)
+}
+
+// DoRestWithForm performs a http request where the body are all bytes read from fieldvalue.
+func (ts Triplestore) DoRestWithForm(ctx context.Context, timeout time.Duration, method, url string, headers *RequestHeaders, fieldname string, fieldvalue io.Reader) (*http.Response, error) {
+	var buffer bytes.Buffer
+
+	// write the file to it
+	writer := multipart.NewWriter(&buffer)
+	{
+		part, err := writer.CreateFormFile(fieldname, "filename.txt")
+		if err != nil {
+			return nil, err
+		}
+		io.Copy(part, fieldvalue)
+	}
+	writer.Close()
+
+	// and sent the reader as the body
+	return ts.DoRestWithReader(ctx, timeout, method, url, headers.With(RequestHeaders{ContentType: writer.FormDataContentType()}), &buffer)
+}
+
+// DoRestWithReader performs a http request where the body is copied from the given io.Reader.
+// The caller must ensure the reader is closed.
+func (ts Triplestore) DoRestWithMarshal(ctx context.Context, timeout time.Duration, method, url string, headers *RequestHeaders, body any) (*http.Response, error) {
+	// encode into a buffer
+	var buffer bytes.Buffer
+	if err := json.NewEncoder(&buffer).Encode(body); err != nil {
+		return nil, err
+	}
+
+	return ts.DoRestWithReader(ctx, timeout, method, url, headers.With(RequestHeaders{ContentType: "application/json"}), &buffer)
+}
+
+// DoRestWithReader performs a http request where the body is copied from the given io.Reader.
+// The caller must ensure the reader is closed.
+func (ts Triplestore) DoRestWithReader(ctx context.Context, timeout time.Duration, method string, url string, headers *RequestHeaders, body io.Reader) (*http.Response, error) {
 	// create the request object
 	client := &http.Client{
 		Timeout: timeout,
@@ -75,20 +103,22 @@ func (ts Triplestore) OpenRaw(ctx context.Context, method, url string, body any,
 			DisableKeepAlives: true,
 		},
 	}
-	req, err := http.NewRequestWithContext(ctx, method, ts.BaseURL+url, reader)
+
+	// create the request and authentication
+	req, err := http.NewRequestWithContext(ctx, method, ts.BaseURL+url, body)
 	if err != nil {
 		return nil, err
 	}
-
-	// Setup configuration!
-	if accept != "" {
-		req.Header.Set("Accept", accept)
-	}
-	if contentType != "" {
-		req.Header.Set("Content-Type", contentType)
-	}
 	req.SetBasicAuth(ts.Config.TS.AdminUsername, ts.Config.TS.AdminPassword)
 
+	// add extra headers
+	if headers != nil && headers.Accept != "" {
+		req.Header.Set("Accept", headers.Accept)
+	}
+	if headers != nil && headers.ContentType != "" {
+		req.Header.Set("Content-Type", headers.ContentType)
+	}
+
 	// and send it
 	return client.Do(req)
 }
@@ -97,7 +127,7 @@ func (ts Triplestore) OpenRaw(ctx context.Context, method, url string, body any,
 // This is achieved using a polling strategy.
 func (ts Triplestore) Wait(ctx context.Context) error {
 	return timex.TickUntilFunc(func(time.Time) bool {
-		res, err := ts.OpenRaw(ctx, "GET", "/rest/repositories", nil, "", "", tsTrivialTimeout)
+		res, err := ts.DoRest(ctx, tsTrivialTimeout, http.MethodGet, "/rest/repositories", nil)
 		zerolog.Ctx(ctx).Trace().Err(err).Msg("Triplestore wait")
 		if err != nil {
 			return false
@@ -110,10 +140,11 @@ func (ts Triplestore) Wait(ctx context.Context) error {
 // PurgeUser deletes the specified user from the triplestore.
 // When the user does not exist, returns no error.
 func (ts Triplestore) PurgeUser(ctx context.Context, user string) error {
-	res, err := ts.OpenRaw(ctx, "DELETE", "/rest/security/users/"+user, nil, "", "", tsTrivialTimeout)
+	res, err := ts.DoRest(ctx, tsTrivialTimeout, http.MethodDelete, "/rest/security/users/"+user, nil)
 	if err != nil {
 		return err
 	}
+	defer res.Body.Close()
 	if res.StatusCode != http.StatusNoContent && res.StatusCode != http.StatusNotFound {
 		return errors.Errorf("Delete returned code %d", res.StatusCode)
 	}
@@ -123,10 +154,11 @@ func (ts Triplestore) PurgeUser(ctx context.Context, user string) error {
 // PurgeRepo deletes the specified repo from the triplestore.
 // When the repo does not exist, returns no error.
 func (ts Triplestore) PurgeRepo(ctx context.Context, repo string) error {
-	res, err := ts.OpenRaw(ctx, "DELETE", "/rest/repositories/"+repo, nil, "", "", tsTrivialTimeout)
+	res, err := ts.DoRest(ctx, tsTrivialTimeout, http.MethodDelete, "/rest/repositories/"+repo, nil)
 	if err != nil {
 		return err
 	}
+	defer res.Body.Close()
 	if res.StatusCode != http.StatusOK && res.StatusCode != http.StatusNotFound {
 		return errors.Errorf("Delete returned code %d", res.StatusCode)
 	}