Merge remote-tracking branch 'origin/master' into feature/vhosts

README.md

@@ -42,6 +42,7 @@ This provider offers the following resources:
 and the following data sources:
 
 - [`mittwald_systemsoftware`](https://registry.terraform.io/providers/mittwald/mittwald/latest/docs/data-sources/systemsoftware)
+- [`mittwald_user`](https://registry.terraform.io/providers/mittwald/mittwald/latest/docs/data-sources/user)
 
 Coming soon:
 

api/mittwaldv2/client_builder.go

@@ -6,6 +6,7 @@ type ClientBuilder interface {
 	Database() DatabaseClient
 	Cronjob() CronjobClient
 	Domain() DomainClient
+	User() UserClient
 }
 
 type clientBuilder struct {
@@ -41,3 +42,9 @@ func (b *clientBuilder) Domain() DomainClient {
 		client: b.internalClient,
 	}
 }
+
+func (b *clientBuilder) User() UserClient {
+	return &userClient{
+		client: b.internalClient,
+	}
+}

api/mittwaldv2/client_opts.go

@@ -2,7 +2,6 @@ package mittwaldv2
 
 import (
 	"bytes"
-	"context"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"io"
 	"net/http"
@@ -53,7 +52,7 @@ func (c *debuggingClient) Do(req *http.Request) (*http.Response, error) {
 		logFields["err"] = err
 	}
 
-	tflog.Debug(context.Background(), "executed request", logFields)
+	tflog.Debug(req.Context(), "executed request", logFields)
 
 	return res, err
 }

api/mittwaldv2/client_project.go

@@ -8,6 +8,7 @@ import (
 
 type ProjectClient interface {
 	ListProjects(ctx context.Context) ([]DeMittwaldV1ProjectProject, error)
+	GetProject(ctx context.Context, projectID string) (*DeMittwaldV1ProjectProject, error)
 	CreateProjectOnServer(ctx context.Context, serverID string, body ProjectCreateProjectJSONRequestBody) (string, error)
 	DeleteProject(ctx context.Context, projectID string) error
 	PollProject(ctx context.Context, projectID string) (*DeMittwaldV1ProjectProject, error)
@@ -60,6 +61,19 @@ func (c *projectClient) ListProjects(ctx context.Context) ([]DeMittwaldV1Project
 	return nil, errUnexpectedStatus(response.StatusCode(), response.Body)
 }
 
+func (c *projectClient) GetProject(ctx context.Context, projectID string) (*DeMittwaldV1ProjectProject, error) {
+	response, err := c.client.ProjectGetProjectWithResponse(ctx, uuid.MustParse(projectID))
+	if err != nil {
+		return nil, err
+	}
+
+	if response.JSON200 != nil {
+		return response.JSON200, nil
+	}
+
+	return nil, errUnexpectedStatus(response.StatusCode(), response.Body)
+}
+
 func (c *projectClient) CreateProjectOnServer(ctx context.Context, serverID string, body ProjectCreateProjectJSONRequestBody) (string, error) {
 	response, err := c.client.ProjectCreateProjectWithResponse(
 		ctx,

api/mittwaldv2/client_user.go

@@ -0,0 +1,72 @@
+package mittwaldv2
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"net/url"
+)
+
+type UserClient interface {
+	GetCurrentUser(ctx context.Context) (*DeMittwaldV1UserUser, error)
+	GetUser(ctx context.Context, userID string) (*DeMittwaldV1UserUser, error)
+}
+
+type userClient struct {
+	client ClientWithResponsesInterface
+}
+
+func (c *userClient) GetCurrentUser(ctx context.Context) (*DeMittwaldV1UserUser, error) {
+	return c.GetUser(ctx, "self")
+}
+
+func (c *userClient) GetUser(ctx context.Context, userID string) (*DeMittwaldV1UserUser, error) {
+	// NOTE:
+	// It is necessary to work directly with the innards of the client here,
+	// because the generated client is incorrect at this point. This is related
+	// to a number of issues:
+	//
+	// - https://github.com/deepmap/oapi-codegen/issues/1429
+	// - https://github.com/deepmap/oapi-codegen/issues/1433
+	// - https://github.com/deepmap/oapi-codegen/issues/1029
+
+	clientWithResponses, ok := c.client.(*ClientWithResponses)
+	if !ok {
+		return nil, fmt.Errorf("unexpected client type: %T", c.client)
+	}
+
+	client, ok := clientWithResponses.ClientInterface.(*Client)
+	if !ok {
+		return nil, fmt.Errorf("unexpected client type: %T", clientWithResponses.ClientInterface)
+	}
+
+	serverURL, err := url.Parse(client.Server)
+	if err != nil {
+		return nil, fmt.Errorf("error parsing server URL: %w", err)
+	}
+	operationURL, err := serverURL.Parse(fmt.Sprintf("/v2/users/%s", userID))
+	if err != nil {
+		return nil, fmt.Errorf("error parsing operation URL: %w", err)
+	}
+
+	req, _ := http.NewRequest("GET", operationURL.String(), nil)
+	req = req.WithContext(ctx)
+	if err := client.applyEditors(ctx, req, nil); err != nil {
+		return nil, err
+	}
+	httpResp, err := client.Client.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("error getting user: %w", err)
+	}
+
+	resp, err := ParseUserGetUserResponse(httpResp)
+	if err != nil {
+		return nil, fmt.Errorf("error getting user: %w", err)
+	}
+
+	if resp.JSON200 == nil {
+		return nil, errUnexpectedStatus(resp.StatusCode(), resp.Body)
+	}
+
+	return resp.JSON200, nil
+}

api/mittwaldv2/generate.go

@@ -5,6 +5,9 @@ package mittwaldv2
 // NOTE: This needs a patched version of oapi-codegen; PR #1178 [1] is
 // needed to generate the correct code for the Mittwald API.
 //
+// Run with `go generate -tags generate_api ./api/...` to generate the
+// Mittwald API client.
+//
 //   [1]: https://github.com/deepmap/oapi-codegen/pull/1178
 
 //go:generate wget https://api.mittwald.de/openapi -Oopenapi.json