From cf2b2f27910919a745fa573d0e513f588f352971 Mon Sep 17 00:00:00 2001 From: Daniel Moran Date: Mon, 3 May 2021 11:06:18 -0400 Subject: [PATCH] refactor: update codegen to clean old files, use new extension (#57) --- etc/generate-openapi.sh | 13 +- .../{api_buckets.go => api_buckets.gen.go} | 0 .../api/{api_health.go => api_health.gen.go} | 0 ...anizations.go => api_organizations.gen.go} | 0 .../api/{api_setup.go => api_setup.gen.go} | 0 .../api/{api_write.go => api_write.gen.go} | 0 internal/api/{client.go => client.gen.go} | 0 ...{configuration.go => configuration.gen.go} | 0 ...rization.go => model_authorization.gen.go} | 0 ...f.go => model_authorization_all_of.gen.go} | 0 ...> model_authorization_all_of_links.gen.go} | 0 ...model_authorization_update_request.gen.go} | 0 .../{model_bucket.go => model_bucket.gen.go} | 0 ...ket_links.go => model_bucket_links.gen.go} | 0 ...{model_buckets.go => model_buckets.gen.go} | 0 internal/api/model_buckets_links.go | 181 ------------------ .../{model_error.go => model_error.gen.go} | 0 ..._error_code.go => model_error_code.gen.go} | 0 ...lth_check.go => model_health_check.gen.go} | 0 ...us.go => model_health_check_status.gen.go} | 0 ...00.go => model_inline_response_200.gen.go} | 0 .../{model_label.go => model_label.gen.go} | 0 ...or.go => model_line_protocol_error.gen.go} | 0 ...> model_line_protocol_length_error.gen.go} | 0 .../{model_links.go => model_links.gen.go} | 0 ...est.go => model_onboarding_request.gen.go} | 0 ...se.go => model_onboarding_response.gen.go} | 0 ...anization.go => model_organization.gen.go} | 0 ...nks.go => model_organization_links.gen.go} | 0 ...izations.go => model_organizations.gen.go} | 0 ...t.go => model_patch_bucket_request.gen.go} | 0 ...e.go => model_patch_retention_rule.gen.go} | 0 ..._permission.go => model_permission.gen.go} | 0 ...ce.go => model_permission_resource.gen.go} | 0 ...st.go => model_post_bucket_request.gen.go} | 0 ...on_rule.go => model_retention_rule.gen.go} | 0 ...response.go => model_user_response.gen.go} | 0 ...ks.go => model_user_response_links.gen.go} | 0 ...cision.go => model_write_precision.gen.go} | 0 internal/api/{response.go => response.gen.go} | 0 internal/api/{utils.go => utils.gen.go} | 0 41 files changed, 12 insertions(+), 182 deletions(-) rename internal/api/{api_buckets.go => api_buckets.gen.go} (100%) rename internal/api/{api_health.go => api_health.gen.go} (100%) rename internal/api/{api_organizations.go => api_organizations.gen.go} (100%) rename internal/api/{api_setup.go => api_setup.gen.go} (100%) rename internal/api/{api_write.go => api_write.gen.go} (100%) rename internal/api/{client.go => client.gen.go} (100%) rename internal/api/{configuration.go => configuration.gen.go} (100%) rename internal/api/{model_authorization.go => model_authorization.gen.go} (100%) rename internal/api/{model_authorization_all_of.go => model_authorization_all_of.gen.go} (100%) rename internal/api/{model_authorization_all_of_links.go => model_authorization_all_of_links.gen.go} (100%) rename internal/api/{model_authorization_update_request.go => model_authorization_update_request.gen.go} (100%) rename internal/api/{model_bucket.go => model_bucket.gen.go} (100%) rename internal/api/{model_bucket_links.go => model_bucket_links.gen.go} (100%) rename internal/api/{model_buckets.go => model_buckets.gen.go} (100%) delete mode 100644 internal/api/model_buckets_links.go rename internal/api/{model_error.go => model_error.gen.go} (100%) rename internal/api/{model_error_code.go => model_error_code.gen.go} (100%) rename internal/api/{model_health_check.go => model_health_check.gen.go} (100%) rename internal/api/{model_health_check_status.go => model_health_check_status.gen.go} (100%) rename internal/api/{model_inline_response_200.go => model_inline_response_200.gen.go} (100%) rename internal/api/{model_label.go => model_label.gen.go} (100%) rename internal/api/{model_line_protocol_error.go => model_line_protocol_error.gen.go} (100%) rename internal/api/{model_line_protocol_length_error.go => model_line_protocol_length_error.gen.go} (100%) rename internal/api/{model_links.go => model_links.gen.go} (100%) rename internal/api/{model_onboarding_request.go => model_onboarding_request.gen.go} (100%) rename internal/api/{model_onboarding_response.go => model_onboarding_response.gen.go} (100%) rename internal/api/{model_organization.go => model_organization.gen.go} (100%) rename internal/api/{model_organization_links.go => model_organization_links.gen.go} (100%) rename internal/api/{model_organizations.go => model_organizations.gen.go} (100%) rename internal/api/{model_patch_bucket_request.go => model_patch_bucket_request.gen.go} (100%) rename internal/api/{model_patch_retention_rule.go => model_patch_retention_rule.gen.go} (100%) rename internal/api/{model_permission.go => model_permission.gen.go} (100%) rename internal/api/{model_permission_resource.go => model_permission_resource.gen.go} (100%) rename internal/api/{model_post_bucket_request.go => model_post_bucket_request.gen.go} (100%) rename internal/api/{model_retention_rule.go => model_retention_rule.gen.go} (100%) rename internal/api/{model_user_response.go => model_user_response.gen.go} (100%) rename internal/api/{model_user_response_links.go => model_user_response_links.gen.go} (100%) rename internal/api/{model_write_precision.go => model_write_precision.gen.go} (100%) rename internal/api/{response.go => response.gen.go} (100%) rename internal/api/{utils.go => utils.gen.go} (100%) diff --git a/etc/generate-openapi.sh b/etc/generate-openapi.sh index e369267..a6af133 100755 --- a/etc/generate-openapi.sh +++ b/etc/generate-openapi.sh @@ -2,10 +2,15 @@ declare -r ETC_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)" declare -r ROOT_DIR="$(dirname ${ETC_DIR})" +declare -r API_DIR="${ROOT_DIR}/internal/api" +declare -r GENERATED_PATTERN='^// Code generated .* DO NOT EDIT\.$' declare -r GENERATOR_DOCKER_IMG=openapitools/openapi-generator-cli:v5.1.0 declare -r OPENAPI_COMMIT=e41d5e327a67e472a46cd6edfe673496e1b066dd +# Clean up all the generated files in the target directory. +rm $(grep -Elr "${GENERATED_PATTERN}" "${API_DIR}") + # Download our target API spec. # NOTE: openapi-generator supports HTTP references to API docs, but using that feature # causes the host of the URL to be injected into the base paths of generated code. @@ -25,9 +30,15 @@ docker run --rm -it -u "$(id -u):$(id -g)" \ # Edit the generated files. ( # Clean up files we don't care about. - cd "${ROOT_DIR}/internal/api" + cd "${API_DIR}" rm -rf go.mod go.sum git_push.sh api docs .openapi-generator .travis.yml .gitignore + # Change extension of generated files. + for f in $(grep -El "${GENERATED_PATTERN}" *.go); do + base=$(basename ${f} .go) + mv ${f} ${base}.gen.go + done + # Clean up the generated code. cd "${ROOT_DIR}" >/dev/null make fmt diff --git a/internal/api/api_buckets.go b/internal/api/api_buckets.gen.go similarity index 100% rename from internal/api/api_buckets.go rename to internal/api/api_buckets.gen.go diff --git a/internal/api/api_health.go b/internal/api/api_health.gen.go similarity index 100% rename from internal/api/api_health.go rename to internal/api/api_health.gen.go diff --git a/internal/api/api_organizations.go b/internal/api/api_organizations.gen.go similarity index 100% rename from internal/api/api_organizations.go rename to internal/api/api_organizations.gen.go diff --git a/internal/api/api_setup.go b/internal/api/api_setup.gen.go similarity index 100% rename from internal/api/api_setup.go rename to internal/api/api_setup.gen.go diff --git a/internal/api/api_write.go b/internal/api/api_write.gen.go similarity index 100% rename from internal/api/api_write.go rename to internal/api/api_write.gen.go diff --git a/internal/api/client.go b/internal/api/client.gen.go similarity index 100% rename from internal/api/client.go rename to internal/api/client.gen.go diff --git a/internal/api/configuration.go b/internal/api/configuration.gen.go similarity index 100% rename from internal/api/configuration.go rename to internal/api/configuration.gen.go diff --git a/internal/api/model_authorization.go b/internal/api/model_authorization.gen.go similarity index 100% rename from internal/api/model_authorization.go rename to internal/api/model_authorization.gen.go diff --git a/internal/api/model_authorization_all_of.go b/internal/api/model_authorization_all_of.gen.go similarity index 100% rename from internal/api/model_authorization_all_of.go rename to internal/api/model_authorization_all_of.gen.go diff --git a/internal/api/model_authorization_all_of_links.go b/internal/api/model_authorization_all_of_links.gen.go similarity index 100% rename from internal/api/model_authorization_all_of_links.go rename to internal/api/model_authorization_all_of_links.gen.go diff --git a/internal/api/model_authorization_update_request.go b/internal/api/model_authorization_update_request.gen.go similarity index 100% rename from internal/api/model_authorization_update_request.go rename to internal/api/model_authorization_update_request.gen.go diff --git a/internal/api/model_bucket.go b/internal/api/model_bucket.gen.go similarity index 100% rename from internal/api/model_bucket.go rename to internal/api/model_bucket.gen.go diff --git a/internal/api/model_bucket_links.go b/internal/api/model_bucket_links.gen.go similarity index 100% rename from internal/api/model_bucket_links.go rename to internal/api/model_bucket_links.gen.go diff --git a/internal/api/model_buckets.go b/internal/api/model_buckets.gen.go similarity index 100% rename from internal/api/model_buckets.go rename to internal/api/model_buckets.gen.go diff --git a/internal/api/model_buckets_links.go b/internal/api/model_buckets_links.go deleted file mode 100644 index 4f1bf8b..0000000 --- a/internal/api/model_buckets_links.go +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Subset of Influx API covered by Influx CLI - * - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * API version: 2.0.0 - */ - -// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. - -package api - -import ( - "encoding/json" -) - -// BucketsLinks struct for BucketsLinks -type BucketsLinks struct { - // URI of resource. - Next *string `json:"next,omitempty"` - // URI of resource. - Self string `json:"self"` - // URI of resource. - Prev *string `json:"prev,omitempty"` -} - -// NewBucketsLinks instantiates a new BucketsLinks object -// This constructor will assign default values to properties that have it defined, -// and makes sure properties required by API are set, but the set of arguments -// will change when the set of required properties is changed -func NewBucketsLinks(self string) *BucketsLinks { - this := BucketsLinks{} - this.Self = self - return &this -} - -// NewBucketsLinksWithDefaults instantiates a new BucketsLinks object -// This constructor will only assign default values to properties that have it defined, -// but it doesn't guarantee that properties required by API are set -func NewBucketsLinksWithDefaults() *BucketsLinks { - this := BucketsLinks{} - return &this -} - -// GetNext returns the Next field value if set, zero value otherwise. -func (o *BucketsLinks) GetNext() string { - if o == nil || o.Next == nil { - var ret string - return ret - } - return *o.Next -} - -// GetNextOk returns a tuple with the Next field value if set, nil otherwise -// and a boolean to check if the value has been set. -func (o *BucketsLinks) GetNextOk() (*string, bool) { - if o == nil || o.Next == nil { - return nil, false - } - return o.Next, true -} - -// HasNext returns a boolean if a field has been set. -func (o *BucketsLinks) HasNext() bool { - if o != nil && o.Next != nil { - return true - } - - return false -} - -// SetNext gets a reference to the given string and assigns it to the Next field. -func (o *BucketsLinks) SetNext(v string) { - o.Next = &v -} - -// GetSelf returns the Self field value -func (o *BucketsLinks) GetSelf() string { - if o == nil { - var ret string - return ret - } - - return o.Self -} - -// GetSelfOk returns a tuple with the Self field value -// and a boolean to check if the value has been set. -func (o *BucketsLinks) GetSelfOk() (*string, bool) { - if o == nil { - return nil, false - } - return &o.Self, true -} - -// SetSelf sets field value -func (o *BucketsLinks) SetSelf(v string) { - o.Self = v -} - -// GetPrev returns the Prev field value if set, zero value otherwise. -func (o *BucketsLinks) GetPrev() string { - if o == nil || o.Prev == nil { - var ret string - return ret - } - return *o.Prev -} - -// GetPrevOk returns a tuple with the Prev field value if set, nil otherwise -// and a boolean to check if the value has been set. -func (o *BucketsLinks) GetPrevOk() (*string, bool) { - if o == nil || o.Prev == nil { - return nil, false - } - return o.Prev, true -} - -// HasPrev returns a boolean if a field has been set. -func (o *BucketsLinks) HasPrev() bool { - if o != nil && o.Prev != nil { - return true - } - - return false -} - -// SetPrev gets a reference to the given string and assigns it to the Prev field. -func (o *BucketsLinks) SetPrev(v string) { - o.Prev = &v -} - -func (o BucketsLinks) MarshalJSON() ([]byte, error) { - toSerialize := map[string]interface{}{} - if o.Next != nil { - toSerialize["next"] = o.Next - } - if true { - toSerialize["self"] = o.Self - } - if o.Prev != nil { - toSerialize["prev"] = o.Prev - } - return json.Marshal(toSerialize) -} - -type NullableBucketsLinks struct { - value *BucketsLinks - isSet bool -} - -func (v NullableBucketsLinks) Get() *BucketsLinks { - return v.value -} - -func (v *NullableBucketsLinks) Set(val *BucketsLinks) { - v.value = val - v.isSet = true -} - -func (v NullableBucketsLinks) IsSet() bool { - return v.isSet -} - -func (v *NullableBucketsLinks) Unset() { - v.value = nil - v.isSet = false -} - -func NewNullableBucketsLinks(val *BucketsLinks) *NullableBucketsLinks { - return &NullableBucketsLinks{value: val, isSet: true} -} - -func (v NullableBucketsLinks) MarshalJSON() ([]byte, error) { - return json.Marshal(v.value) -} - -func (v *NullableBucketsLinks) UnmarshalJSON(src []byte) error { - v.isSet = true - return json.Unmarshal(src, &v.value) -} diff --git a/internal/api/model_error.go b/internal/api/model_error.gen.go similarity index 100% rename from internal/api/model_error.go rename to internal/api/model_error.gen.go diff --git a/internal/api/model_error_code.go b/internal/api/model_error_code.gen.go similarity index 100% rename from internal/api/model_error_code.go rename to internal/api/model_error_code.gen.go diff --git a/internal/api/model_health_check.go b/internal/api/model_health_check.gen.go similarity index 100% rename from internal/api/model_health_check.go rename to internal/api/model_health_check.gen.go diff --git a/internal/api/model_health_check_status.go b/internal/api/model_health_check_status.gen.go similarity index 100% rename from internal/api/model_health_check_status.go rename to internal/api/model_health_check_status.gen.go diff --git a/internal/api/model_inline_response_200.go b/internal/api/model_inline_response_200.gen.go similarity index 100% rename from internal/api/model_inline_response_200.go rename to internal/api/model_inline_response_200.gen.go diff --git a/internal/api/model_label.go b/internal/api/model_label.gen.go similarity index 100% rename from internal/api/model_label.go rename to internal/api/model_label.gen.go diff --git a/internal/api/model_line_protocol_error.go b/internal/api/model_line_protocol_error.gen.go similarity index 100% rename from internal/api/model_line_protocol_error.go rename to internal/api/model_line_protocol_error.gen.go diff --git a/internal/api/model_line_protocol_length_error.go b/internal/api/model_line_protocol_length_error.gen.go similarity index 100% rename from internal/api/model_line_protocol_length_error.go rename to internal/api/model_line_protocol_length_error.gen.go diff --git a/internal/api/model_links.go b/internal/api/model_links.gen.go similarity index 100% rename from internal/api/model_links.go rename to internal/api/model_links.gen.go diff --git a/internal/api/model_onboarding_request.go b/internal/api/model_onboarding_request.gen.go similarity index 100% rename from internal/api/model_onboarding_request.go rename to internal/api/model_onboarding_request.gen.go diff --git a/internal/api/model_onboarding_response.go b/internal/api/model_onboarding_response.gen.go similarity index 100% rename from internal/api/model_onboarding_response.go rename to internal/api/model_onboarding_response.gen.go diff --git a/internal/api/model_organization.go b/internal/api/model_organization.gen.go similarity index 100% rename from internal/api/model_organization.go rename to internal/api/model_organization.gen.go diff --git a/internal/api/model_organization_links.go b/internal/api/model_organization_links.gen.go similarity index 100% rename from internal/api/model_organization_links.go rename to internal/api/model_organization_links.gen.go diff --git a/internal/api/model_organizations.go b/internal/api/model_organizations.gen.go similarity index 100% rename from internal/api/model_organizations.go rename to internal/api/model_organizations.gen.go diff --git a/internal/api/model_patch_bucket_request.go b/internal/api/model_patch_bucket_request.gen.go similarity index 100% rename from internal/api/model_patch_bucket_request.go rename to internal/api/model_patch_bucket_request.gen.go diff --git a/internal/api/model_patch_retention_rule.go b/internal/api/model_patch_retention_rule.gen.go similarity index 100% rename from internal/api/model_patch_retention_rule.go rename to internal/api/model_patch_retention_rule.gen.go diff --git a/internal/api/model_permission.go b/internal/api/model_permission.gen.go similarity index 100% rename from internal/api/model_permission.go rename to internal/api/model_permission.gen.go diff --git a/internal/api/model_permission_resource.go b/internal/api/model_permission_resource.gen.go similarity index 100% rename from internal/api/model_permission_resource.go rename to internal/api/model_permission_resource.gen.go diff --git a/internal/api/model_post_bucket_request.go b/internal/api/model_post_bucket_request.gen.go similarity index 100% rename from internal/api/model_post_bucket_request.go rename to internal/api/model_post_bucket_request.gen.go diff --git a/internal/api/model_retention_rule.go b/internal/api/model_retention_rule.gen.go similarity index 100% rename from internal/api/model_retention_rule.go rename to internal/api/model_retention_rule.gen.go diff --git a/internal/api/model_user_response.go b/internal/api/model_user_response.gen.go similarity index 100% rename from internal/api/model_user_response.go rename to internal/api/model_user_response.gen.go diff --git a/internal/api/model_user_response_links.go b/internal/api/model_user_response_links.gen.go similarity index 100% rename from internal/api/model_user_response_links.go rename to internal/api/model_user_response_links.gen.go diff --git a/internal/api/model_write_precision.go b/internal/api/model_write_precision.gen.go similarity index 100% rename from internal/api/model_write_precision.go rename to internal/api/model_write_precision.gen.go diff --git a/internal/api/response.go b/internal/api/response.gen.go similarity index 100% rename from internal/api/response.go rename to internal/api/response.gen.go diff --git a/internal/api/utils.go b/internal/api/utils.gen.go similarity index 100% rename from internal/api/utils.go rename to internal/api/utils.gen.go