Merge pull request #16 from l-with/add-resource-oauth2-client

add resource oauth2 client

api/api.go

@@ -254,6 +254,13 @@ type ApiMailcowGetRequest struct {
 	xAPIKey    *string
 }
 
+type ApiMailcowGetAllRequest struct {
+	ctx        context.Context
+	ApiService *ApiService
+	endpoint   string
+	xAPIKey    *string
+}
+
 func (r ApiMailcowGetRequest) XAPIKey(xAPIKey string) ApiMailcowGetRequest {
 	r.xAPIKey = &xAPIKey
 	return r
@@ -351,6 +358,93 @@ func (a *ApiService) MailcowGetExecute(r ApiMailcowGetRequest) (*http.Response,
 	return localVarHTTPResponse, nil
 }
 
+func (a *ApiService) MailcowGetAllExecute(r ApiMailcowGetAllRequest) (*http.Response, error) {
+	var (
+		localVarHTTPMethod = http.MethodGet
+		localVarPostBody   interface{}
+		formFiles          []formFile
+	)
+
+	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ApiService.MailcowGet")
+	if err != nil {
+		return nil, &GenericOpenAPIError{error: err.Error()}
+	}
+
+	localVarPath := localBasePath + r.endpoint
+
+	localVarHeaderParams := make(map[string]string)
+	localVarQueryParams := url.Values{}
+	localVarFormParams := url.Values{}
+
+	// to determine the Content-Type header
+	localVarHTTPContentTypes := []string{}
+
+	// set Content-Type header
+	localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes)
+	if localVarHTTPContentType != "" {
+		localVarHeaderParams["Content-Type"] = localVarHTTPContentType
+	}
+
+	// to determine the Accept header
+	localVarHTTPHeaderAccepts := []string{"application/json"}
+
+	// set Accept header
+	localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts)
+	if localVarHTTPHeaderAccept != "" {
+		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
+	}
+	if r.xAPIKey != nil {
+		localVarHeaderParams["X-API-Key"] = parameterToString(*r.xAPIKey, "")
+	}
+	if r.ctx != nil {
+		// API Key Authentication
+		if auth, ok := r.ctx.Value(ContextAPIKeys).(map[string]APIKey); ok {
+			if apiKey, ok := auth["ApiKeyAuth"]; ok {
+				var key string
+				if apiKey.Prefix != "" {
+					key = apiKey.Prefix + " " + apiKey.Key
+				} else {
+					key = apiKey.Key
+				}
+				localVarHeaderParams["X-API-Key"] = key
+			}
+		}
+	}
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	if err != nil {
+		return nil, err
+	}
+
+	localVarHTTPResponse, err := a.client.callAPI(req)
+	if err != nil || localVarHTTPResponse == nil {
+		return localVarHTTPResponse, err
+	}
+
+	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarHTTPResponse.Body.Close()
+	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	if err != nil {
+		return localVarHTTPResponse, err
+	}
+
+	if localVarHTTPResponse.StatusCode >= 300 {
+		newErr := &GenericOpenAPIError{
+			body:  localVarBody,
+			error: localVarHTTPResponse.Status,
+		}
+		var v ErrorResponse
+		err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
+		if err != nil {
+			newErr.error = err.Error()
+			return localVarHTTPResponse, newErr
+		}
+		newErr.model = v
+		return localVarHTTPResponse, newErr
+	}
+
+	return localVarHTTPResponse, nil
+}
+
 type ApiMailcowUpdateRequest struct {
 	ctx                  context.Context
 	ApiService           *ApiService

api/model_alias_response.go

@@ -5,13 +5,13 @@ import (
 	"fmt"
 )
 
-func (o *MailcowResponseArray) GetId() (error, *string) {
+func (o *MailcowResponseArray) GetAliasId() (*string, error) {
 	if !o.HasFinalMsgItem(0) || !o.HasFinalMsgItem(2) {
-		return errors.New(fmt.Sprint("msg error: ", o.GetFinalMsgs())), nil
+		return nil, errors.New(fmt.Sprint("msg error: ", o.GetFinalMsgs()))
 	}
 	receipt := *o.GetFinalMsgItem(0)
 	if receipt != "alias_added" {
-		return errors.New(fmt.Sprint("msg error: ", receipt)), nil
+		return nil, errors.New(fmt.Sprint("msg error: ", receipt))
 	}
-	return nil, o.GetFinalMsgItem(2)
+	return o.GetFinalMsgItem(2), nil
 }

api/model_create_request.go

@@ -53,6 +53,14 @@ func NewCreateSyncjobRequest() *MailcowCreateRequest {
 	return &this
 }
 
+func NewCreateOAuth2ClientRequest() *MailcowCreateRequest {
+	this := MailcowCreateRequest{}
+	this.payload = make(map[string]interface{})
+	this.endpoint = "/api/v1/add/oauth2-client"
+	this.ResourceName = "resourceOAuth2Client"
+	return &this
+}
+
 func (o *MailcowCreateRequest) Get(key string) interface{} {
 	if !o.Has(key) {
 		var ret bool
@@ -129,7 +137,7 @@ func (o MailcowCreateRequest) MarshalJSON(requestSpec map[string]interface{}) ([
 	//if o.attr != nil {
 	//	toSerialize["attr"] = o.attr
 	//}
-	for key, _ := range requestSpec {
+	for key := range requestSpec {
 		//key := element.(map)
 		if o.payload[key] != nil {
 			toSerialize[key] = o.payload[key]

api/model_delete_request.go

@@ -47,6 +47,13 @@ func NewDeleteSyncjobRequest() *MailcowDeleteRequest {
 	return &this
 }
 
+func NewDeleteOAuth2ClientRequest() *MailcowDeleteRequest {
+	this := MailcowDeleteRequest{}
+	this.endpoint = "/api/v1/delete/oauth2-client"
+	this.ResourceName = "resourceOAuth2Client"
+	return &this
+}
+
 func (o *MailcowDeleteRequest) GetItem() *string {
 	log.Print("[TRACE] GetItem")
 	if !o.HasItem() {

api/model_get_request.go

@@ -46,3 +46,20 @@ func (a *ApiService) MailcowGetSyncjob(ctx context.Context, id string) ApiMailco
 		id:         id,
 	}
 }
+
+func (a *ApiService) MailcowGetOAuth2Client(ctx context.Context, id string) ApiMailcowGetRequest {
+	return ApiMailcowGetRequest{
+		ApiService: a,
+		ctx:        ctx,
+		endpoint:   "/api/v1/get/oauth2-client/{id}",
+		id:         id,
+	}
+}
+
+func (a *ApiService) MailcowGetOAuth2Clients(ctx context.Context) ApiMailcowGetAllRequest {
+	return ApiMailcowGetAllRequest{
+		ApiService: a,
+		ctx:        ctx,
+		endpoint:   "/api/v1/get/oauth2-client/all",
+	}
+}

docs/index.md

@@ -42,7 +42,7 @@ This is under development. You will certainly find bugs and limitations. In thos
 <!-- schema generated by tfplugindocs -->
 ## Schema
 
-### Required
+### Optional
 
 - `api_key` (String, Sensitive) The mailcow API key, can optionally be passed as `MAILCOW_API_KEY` environmental variable
 - `host_name` (String) The name of the mailcow host, can optionally be passed as `MAILCOW_HOST_NAME` environmental variable

docs/resources/oauth2_client.md

@@ -0,0 +1,37 @@
+---
+page_title: "mailcow_oauth2_client Resource - terraform-provider-mailcow"
+subcategory: ""
+description: |-
+---
+
+# mailcow_oauth2_client (Resource)
+
+Provides an OAuth2 client for mailcow. 
+This can be used to create and delete OAuth2 clients for mailcow.
+
+## Example Usage
+```terraform
+resource "mailcow_oauth2_client" "client" {
+  redirect_uri = "https:/redirect.uri"
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `redirect_uri` (String)
+
+### Read-Only
+
+- `client_id` (String)
+- `client_secret` (String, Sensitive)
+- `id` (String) The ID of this resource.
+- `scope` (String)
+
+## Restriction
+
+The mailcow API does not return the id of the OAuth2 client as response for creation.
+As workaround the redirect uri is used as identifier for the resource.
+As consequence creation of an OAuth2 client with an existing redirect uri is prohibited.

examples/resources/mailcow_oauth2_client/resource.tf

@@ -0,0 +1,3 @@
+resource "mailcow_oauth2_client" "client" {
+  redirect_uri = "https:/redirect.uri"
+}

mailcow/provider.go

@@ -26,11 +26,12 @@ func Provider() *schema.Provider {
 			},
 		},
 		ResourcesMap: map[string]*schema.Resource{
-			"mailcow_alias":   resourceAlias(),
-			"mailcow_domain":  resourceDomain(),
-			"mailcow_mailbox": resourceMailbox(),
-			"mailcow_dkim":    resourceDkim(),
-			"mailcow_syncjob": resourceSyncjob(),
+			"mailcow_alias":         resourceAlias(),
+			"mailcow_domain":        resourceDomain(),
+			"mailcow_mailbox":       resourceMailbox(),
+			"mailcow_dkim":          resourceDkim(),
+			"mailcow_syncjob":       resourceSyncjob(),
+			"mailcow_oauth2_client": resourceOAuth2Client(),
 		},
 		DataSourcesMap: map[string]*schema.Resource{
 			"mailcow_domain":  dataSourceDomain(),

mailcow/resource_alias.go

@@ -71,7 +71,7 @@ func resourceAliasCreate(ctx context.Context, d *schema.ResourceData, m interfac
 		return diag.FromErr(err)
 	}
 
-	err, id := response.GetId()
+	id, err := response.GetAliasId()
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -99,6 +99,9 @@ func resourceAliasRead(ctx context.Context, d *schema.ResourceData, m interface{
 	}
 
 	setResourceData(resourceAlias(), d, &alias, nil, nil)
+	if err != nil {
+		return diag.FromErr(err)
+	}
 
 	d.SetId(fmt.Sprint(alias["id"].(float64)))