handle JSONSchemaProps

mingfang · Nov 5, 2020 · 4d97ed3 · 4d97ed3
1 parent 7657f29
commit 4d97ed3
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/cmd/extractor/k8s2tf_print_visitor.go b/cmd/extractor/k8s2tf_print_visitor.go
@@ -136,7 +136,7 @@ func (this *K8S2TFPrintVisitor) VisitKind(proto *proto.Kind) {
 
 	//fmt.Fprintf(this.buf, "%s//VisitKind %s %s\n", this.indent, this.key, proto.GetPath())
 	//special handling for JSON data
-	if proto.GetPath().String() == "io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaProps" {
+	if k8s.IsJSONSchemaProps(proto.GetPath().String()) {
 		//log.Println("VisitKind JSON:", this.path)
 		this.handleJSON()
 		return

diff --git a/k8s/k8s2tf_read_visitor.go b/k8s/k8s2tf_read_visitor.go
@@ -107,7 +107,7 @@ func (this *K8S2TFReadVisitor) VisitKind(proto *proto.Kind) {
 	}
 
 	//special handling for JSON data
-	if proto.GetPath().String() == "io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaProps" {
+	if IsJSONSchemaProps(proto.GetPath().String()) {
 		this.handleJSON()
 		return
 	}

diff --git a/k8s/k8s2tf_schema_visitor.go b/k8s/k8s2tf_schema_visitor.go
@@ -70,7 +70,7 @@ func (this *K8S2TFSchemaVisitor) VisitKind(proto *proto.Kind) {
 	//log.Println("VisitKind path:", this.path, "GetPath:", proto.GetPath())
 
 	//special handling for JSON data
-	if proto.GetPath().String() == "io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaProps" {
+	if IsJSONSchemaProps(proto.GetPath().String()) {
 		this.handleJSON()
 		this.Schema.Description = proto.GetDescription()
 		return

diff --git a/k8s/tf2k8s_visitor.go b/k8s/tf2k8s_visitor.go
@@ -127,7 +127,7 @@ func (this *TF2K8SVisitor) VisitKind(proto *proto.Kind) {
 	//log.Println("VisitKind keyPath:", this.keyPath)
 
 	//special handling for JSON data
-	if proto.GetPath().String() == "io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaProps" {
+	if IsJSONSchemaProps(proto.GetPath().String()) {
 		this.handleJSON()
 		return
 	}

diff --git a/k8s/utils.go b/k8s/utils.go
@@ -215,3 +215,16 @@ func PrintKeys(data map[string]struct{}) {
 func IsDeprecated(schema *tfSchema.Schema) bool {
 	return strings.Contains(schema.Description, "DEPRECATED")
 }
+
+var jsonSchemaPropsPattern = []*regexp.Regexp{
+	regexp.MustCompile(`k8s\..*\.JSONSchemaProps`),
+}
+
+func IsJSONSchemaProps(path string) bool {
+	for _, pattern := range jsonSchemaPropsPattern {
+		if pattern.MatchString(path) {
+			return true
+		}
+	}
+	return false
+}