zph · zph · Jul 19, 2024 · Jun 28, 2024 · Jul 4, 2024 · Jul 4, 2024
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,7 +2,7 @@ name: Main (test, releases)
 on:
   # # Indicates I want to run this workflow on all branches, PR, and tags
   push:
-    branches: ["*"]
+    branches: ["master"]
     tags: ["*"]
   pull_request:
     branches: [ "master" ]

diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 example.tf
 terraform.tfplan
 terraform.tfstate
+.terraform.lock*
 terraform-provider-mysql
 bin/
 modules-dev/

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -3,8 +3,10 @@
 version: 2
 before:
   hooks:
-    # this is just an example and not a requirement for provider building/publishing
     - go mod tidy
+    # Disabled until auto-generated docs and manual docs operate peacefully
+    # - go generate ./...
+
 builds:
   - env:
       # goreleaser does not work with CGO, it could also complicate

diff --git a/GNUmakefile b/GNUmakefile
@@ -6,10 +6,30 @@ TERRAFORM_VERSION=0.14.7
 TERRAFORM_OS=$(shell uname -s | tr A-Z a-z)
 TEST_USER=root
 TEST_PASSWORD=my-secret-pw
-DATESTAMP=$(shell date "+%Y%m%d%H%M%S")
+DATESTAMP=$(shell date "+%Y%m%d")
 SHA_SHORT=$(shell git describe --match=FORCE_NEVER_MATCH --always --abbrev=40 --dirty --abbrev)
 MOST_RECENT_UPSTREAM_TAG=$(shell git for-each-ref refs/tags --sort=-taggerdate --format="%(refname)" | head -1 | grep -E -o "v\d+\.\d+\.\d+")
 
+OS_ARCH=linux_amd64
+# Set correct OS_ARCH on Mac
+UNAME := $(shell uname -s)
+ifeq ($(UNAME),Darwin)
+	HW := $(shell uname -m)
+	ifeq ($(HW),arm64)
+		ARCH=$(HW)
+	else
+		ARCH=amd64
+	endif
+	OS_ARCH=darwin_$(ARCH)
+endif
+
+HOSTNAME=registry.terraform.io
+NAMESPACE=zph
+NAME=mysql
+VERSION=9.9.9
+## on linux base os
+TERRAFORM_PLUGINS_DIRECTORY=~/.terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAME}/${VERSION}/${OS_ARCH}
+
 default: build
 
 build: fmtcheck
@@ -121,12 +141,26 @@ endif
 
 	@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME)
 
+install:
+	mkdir -p ${TERRAFORM_PLUGINS_DIRECTORY}
+	go build -o ${TERRAFORM_PLUGINS_DIRECTORY}/terraform-provider-${NAME}
+	cd examples && rm -rf .terraform
+	cd examples && make init
+
+re-install:
+	rm -f examples/.terraform.lock.hcl
+	rm -f ${TERRAFORM_PLUGINS_DIRECTORY}/terraform-provider-${NAME}
+	go build -o ${TERRAFORM_PLUGINS_DIRECTORY}/terraform-provider-${NAME}
+	cd examples && rm -rf .terraform
+	cd examples && terraform init
+
 format-tag:
 	@echo $(MOST_RECENT_UPSTREAM_TAG)-$(DATESTAMP)-$(SHA_SHORT)
 
 tag:
 	@echo git tag -a $(MOST_RECENT_UPSTREAM_TAG)-$(DATESTAMP)-$(SHA_SHORT) -m $(MOST_RECENT_UPSTREAM_TAG)-$(DATESTAMP)-$(SHA_SHORT)
 	@git tag -a $(MOST_RECENT_UPSTREAM_TAG)-$(DATESTAMP)-$(SHA_SHORT) -m $(MOST_RECENT_UPSTREAM_TAG)-$(DATESTAMP)-$(SHA_SHORT)
 
-
-.PHONY: build test testacc vet fmt fmtcheck errcheck vendor-status test-compile website website-test tag
+release:
+	@goreleaser release --clean --verbose
+.PHONY: build test testacc vet fmt fmtcheck errcheck vendor-status test-compile website website-test tag format-tag
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ fragmentation. We will update this readme if those design choices change.
 
 zph fork will use release naming in the following form:
 
-v3.0.62-20240705125429-3c7af6a
+v3.0.62-20240705-3c7af6a
 
 {petoju version}-{date}-{sha}
 

diff --git a/docs/data-sources/databases.md b/docs/data-sources/databases.md
@@ -0,0 +1,25 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "mysql_databases Data Source - terraform-provider-mysql"
+subcategory: ""
+description: |-
+
+---
+
+# mysql_databases (Data Source)
+
+
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Optional
+
+- `pattern` (String)
+
+### Read-Only
+
+- `databases` (List of String)
+- `id` (String) The ID of this resource.
diff --git a/docs/data-sources/tables.md b/docs/data-sources/tables.md
@@ -0,0 +1,29 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "mysql_tables Data Source - terraform-provider-mysql"
+subcategory: ""
+description: |-
+
+---
+
+# mysql_tables (Data Source)
+
+
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `database` (String)
+
+### Optional
+
+- `pattern` (String)
+
+### Read-Only
+
+- `id` (String) The ID of this resource.
+- `tables` (List of String)
diff --git a/website/docs/index.html.markdown → docs/index.md b/website/docs/index.html.markdown → docs/index.md
diff --git a/website/docs/r/database.html.markdown → docs/resources/database.md b/website/docs/r/database.html.markdown → docs/resources/database.md
diff --git a/website/docs/r/default_roles.html.markdown → docs/resources/default_roles.md b/website/docs/r/default_roles.html.markdown → docs/resources/default_roles.md
diff --git a/website/docs/r/global_variable.html.markdown → docs/resources/global_variable.md b/website/docs/r/global_variable.html.markdown → docs/resources/global_variable.md
diff --git a/website/docs/r/grant.html.markdown → docs/resources/grant.md b/website/docs/r/grant.html.markdown → docs/resources/grant.md
diff --git a/website/docs/r/rds_config.html.markdown → docs/resources/rds_config.md b/website/docs/r/rds_config.html.markdown → docs/resources/rds_config.md
diff --git a/website/docs/r/role.html.markdown → docs/resources/role.md b/website/docs/r/role.html.markdown → docs/resources/role.md
diff --git a/docs/resources/sql.md b/docs/resources/sql.md
@@ -0,0 +1,26 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "mysql_sql Resource - terraform-provider-mysql"
+subcategory: ""
+description: |-
+
+---
+
+# mysql_sql (Resource)
+
+
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `create_sql` (String)
+- `delete_sql` (String)
+- `name` (String)
+
+### Read-Only
+
+- `id` (String) The ID of this resource.
diff --git a/docs/resources/ti_config.md b/docs/resources/ti_config.md
@@ -0,0 +1,30 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "mysql_ti_config Resource - terraform-provider-mysql"
+subcategory: ""
+description: |-
+
+---
+
+# mysql_ti_config (Resource)
+
+
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `name` (String)
+- `type` (String)
+- `value` (String)
+
+### Optional
+
+- `instance` (String)
+
+### Read-Only
+
+- `id` (String) The ID of this resource.
diff --git a/docs/resources/ti_resource_group.md b/docs/resources/ti_resource_group.md
@@ -0,0 +1,31 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "mysql_ti_resource_group Resource - terraform-provider-mysql"
+subcategory: ""
+description: |-
+
+---
+
+# mysql_ti_resource_group (Resource)
+
+
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `name` (String)
+- `resource_units` (Number)
+
+### Optional
+
+- `burstable` (Boolean)
+- `priority` (String)
+- `query_limit` (String)
+
+### Read-Only
+
+- `id` (String) The ID of this resource.
diff --git a/docs/resources/ti_resource_group_user_assignment.md b/docs/resources/ti_resource_group_user_assignment.md
@@ -0,0 +1,25 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "mysql_ti_resource_group_user_assignment Resource - terraform-provider-mysql"
+subcategory: ""
+description: |-
+
+---
+
+# mysql_ti_resource_group_user_assignment (Resource)
+
+
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `resource_group` (String)
+- `user` (String)
+
+### Read-Only
+
+- `id` (String) The ID of this resource.
diff --git a/website/docs/r/user.html.markdown → docs/resources/user.md b/website/docs/r/user.html.markdown → docs/resources/user.md
diff --git a/website/docs/r/user_password.html.markdown → docs/resources/user_password.md b/website/docs/r/user_password.html.markdown → docs/resources/user_password.md
diff --git a/examples/tidb/main.tf b/examples/tidb/main.tf
@@ -0,0 +1,17 @@
+terraform {
+  required_version = ">= 1.5.7"
+
+  required_providers {
+    mongodb = {
+      source = "registry.terraform.io/zph/mysql"
+      version = "9.9.9"
+    }
+  }
+}
+
+provider "mysql" {
+  endpoint = "localhost:4000"
+  username = "root"
+  #alias = "tidb"
+  #password = "admin"
+}
diff --git a/examples/tidb/resource_groups/Makefile b/examples/tidb/resource_groups/Makefile
@@ -0,0 +1,6 @@
+re-install:
+	@cd ../../.. && \
+	 make re-install && \
+	 cd - && \
+	 rm -rf .terraform* && \
+	 terraform init
diff --git a/examples/tidb/resource_groups/main.tf b/examples/tidb/resource_groups/main.tf
@@ -0,0 +1,40 @@
+terraform {
+  required_version = ">= 1.5.7"
+
+  required_providers {
+    mysql = {
+      source = "registry.terraform.io/zph/mysql"
+      version = "9.9.9"
+    }
+  }
+}
+
+provider "mysql" {
+  endpoint = "127.0.0.1:4000"
+
+  username = "root"
+}
+
+resource "mysql_ti_resource_group" "rg1" {
+  name = "rg1"
+  resource_units = 4000
+}
+
+resource "mysql_ti_resource_group" "rg2" {
+  name = "rg2"
+  resource_units = 2000
+  burstable = true
+  priority = "high"
+}
+
+resource "mysql_ti_resource_group_user_assignment" "rg1_user1" {
+  user = "user1"
+  resource_group = mysql_ti_resource_group.rg1.name
+  depends_on = [ mysql_ti_resource_group.rg1 ]
+}
+
+resource "mysql_ti_resource_group_user_assignment" "rg111_rg" {
+  user = "user2"
+  resource_group = mysql_ti_resource_group.rg1.name
+  depends_on = [ mysql_ti_resource_group.rg1 ]
+}