Format code

swiftkube · Feb 1, 2025 · 0221823 · 0221823
1 parent 458caf1
commit 0221823
Show file tree

Hide file tree

Showing 4 changed files with 119 additions and 116 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -42,8 +42,8 @@
         "repositoryURL": "https://github.com/apple/swift-argument-parser",
         "state": {
           "branch": null,
-          "revision": "fddd1c00396eed152c45a46bea9f47b98e59301d",
-          "version": "1.2.0"
+          "revision": "fee6933f37fde9a5e12a1e4aeaa93fe60116ff2a",
+          "version": "1.2.2"
         }
       }
     ]

diff --git a/Sources/SwiftkubeModelGen/Model/GroupVersionKind.swift b/Sources/SwiftkubeModelGen/Model/GroupVersionKind.swift
@@ -39,8 +39,8 @@ struct GroupVersionKind: Decodable, Hashable {
 
 	var renderedGroup: String {
 		(group == "" || group == "core")
-				? "core"
-				: "\(group)"
+			? "core"
+			: "\(group)"
 	}
 
 	var renderedVersion: String {
@@ -59,8 +59,8 @@ struct GroupVersionKind: Decodable, Hashable {
 
 	var renderedFull: String {
 		(group == "" || group == "core")
-				? "\(version)/\(kind)"
-				: "\(group)/\(version)/\(kind)"
+			? "\(version)/\(kind)"
+			: "\(group)/\(version)/\(kind)"
 	}
 
 	var renderedTypeCase: String {
@@ -183,13 +183,13 @@ struct GroupVersion: Decodable, Hashable {
 
 	var renderedType: String {
 		(group == "" || group == "core")
-				? "Core\(version.capitalized)"
-				: "\(APIGroups[group]!)\(version.capitalized)"
+			? "Core\(version.capitalized)"
+			: "\(APIGroups[group]!)\(version.capitalized)"
 	}
 
 	var renderedRaw: String {
 		(group == "" || group == "core")
-				? "core.\(version)"
-				: "\(group).\(version)"
+			? "core.\(version)"
+			: "\(group).\(version)"
 	}
 }
diff --git a/Sources/SwiftkubeModelGen/Model/Property.swift b/Sources/SwiftkubeModelGen/Model/Property.swift
@@ -140,7 +140,7 @@ indirect enum PropertyType: Equatable {
 				return "\(group).\(typeReference.version).\(typeReference.kind)"
 			}
 		case .any:
-			return "JsonField"
+			return "JSONField"
 		default:
 			return "UNKNOWN"
 		}

diff --git a/Sources/SwiftkubeModelGen/Model/Types.swift b/Sources/SwiftkubeModelGen/Model/Types.swift
@@ -57,90 +57,92 @@ let IgnoredSchemaTypes = Set([
 ])
 
 let PluralNames = [
-    "APIService":                       "apiservices",
-    "AuditSink":                        "auditsinks",
-    "Binding":                          "bindings",
-    "CertificateSigningRequest":        "certificatesigningrequests",
-    "ClusterCIDR":                      "clustercidrs",
-    "ClusterRole":                      "clusterroles",
-    "ClusterRoleBinding":               "clusterrolebindings",
-    "ClusterTrustBundle":               "clustertrustbundles",
-    "ComponentStatus":                  "componentstatuses",
-    "ConfigMap":                        "configmaps",
-    "ControllerRevision":               "controllerrevisions",
-    "CronJob":                          "cronjobs",
-    "CSIDriver":                        "csidrivers",
-    "CSINode":                          "csinodes",
-    "CSIStorageCapacity":               "csistoragecapacities",
-    "CustomResourceDefinition":         "customresourcedefinitions",
-    "DaemonSet":                        "daemonsets",
-    "Deployment":                       "deployments",
-    "DeviceClass":                      "deviceclasses",
-    "Endpoints":                        "endpoints",
-    "EndpointSlice":                    "endpointslices",
-    "Event":                            "events",
-    "FlowSchema":                       "flowschemas",
-    "HorizontalPodAutoscaler":          "horizontalpodautoscalers",
-    "Ingress":                          "ingresses",
-    "IngressClass":                     "ingressclasses",
-    "IPAddress":                        "ipaddresses",
-    "Job":                              "jobs",
-    "Lease":                            "leases",
-    "LeaseCandidate":                   "leasecandidates",
-    "LimitRange":                       "limitranges",
-    "LocalSubjectAccessReview":         "localsubjectaccessreviews",
-    "MutatingAdmissionPolicy":          "mutatingadmissionpolicies",
-    "MutatingAdmissionPolicyBinding":   "mutatingadmissionpolicybindings",
-    "MutatingWebhookConfiguration":     "mutatingwebhookconfigurations",
-    "Namespace":                        "namespaces",
-    "NetworkPolicy":                    "networkpolicies",
-    "Node":                             "nodes",
-    "NodeMetrics":                      "nodes",
-    "PersistentVolume":                 "persistentvolumes",
-    "PersistentVolumeClaim":            "persistentvolumeclaims",
-    "Pod":                              "pods",
-    "PodDisruptionBudget":              "poddisruptionbudgets",
-    "PodMetrics":                       "pods",
-    "PodPreset":                        "podpresets",
-    "PodSchedulingContext":             "podschedulingcontexts",
-    "PodSecurityPolicy":                "podsecuritypolicies",
-    "PodTemplate":                      "podtemplates",
-    "PriorityClass":                    "priorityclasses",
-    "PriorityLevelConfiguration":       "prioritylevelconfigurations",
-    "ReplicaSet":                       "replicasets",
-    "ReplicationController":            "replicationcontrollers",
-    "ResourceClaim":                    "resourceclaims",
-    "ResourceClaimParameters":          "resourceclaimparameters",
-    "ResourceClaimTemplate":            "resourceclaimtemplates",
-    "ResourceClass":                    "resourceclasses",
-    "ResourceClassParameters":          "resourceclassparameters",
-    "ResourceQuota":                    "resourcequotas",
-    "ResourceSlice":                    "resourceslices",
-    "Role":                             "roles",
-    "RoleBinding":                      "rolebindings",
-    "RuntimeClass":                     "runtimeclasses",
-    "Secret":                           "secrets",
-    "SelfSubjectAccessReview":          "selfsubjectaccessreviews",
-    "SelfSubjectReview":                "selfsubjectreviews",
-    "SelfSubjectRulesReview":           "selfsubjectrulesreviews",
-    "Service":                          "services",
-    "ServiceAccount":                   "serviceaccounts",
-    "ServiceCIDR":                      "servicecidrs",
-    "StatefulSet":                      "statefulsets",
-    "StorageClass":                     "storageclasses",
-    "StorageVersion":                   "storageversions",
-    "StorageVersionMigration":          "storageversionmigrations",
-    "SubjectAccessReview":              "subjectaccessreviews",
-    "TokenRequest":                     "tokenrequests",
-    "TokenReview":                      "tokenreviews",
-    "ValidatingAdmissionPolicy":        "validatingadmissionpolicies",
-    "ValidatingAdmissionPolicyBinding": "validatingadmissionpolicybindings",
-    "ValidatingWebhookConfiguration":   "validatingwebhookconfigurations",
-    "VolumeAttachment":                 "volumeattachments",
-    "VolumeAttributesClass":            "volumeattributesclasses",
+	"APIService":                       "apiservices",
+	"AuditSink":                        "auditsinks",
+	"Binding":                          "bindings",
+	"CertificateSigningRequest":        "certificatesigningrequests",
+	"ClusterCIDR":                      "clustercidrs",
+	"ClusterRole":                      "clusterroles",
+	"ClusterRoleBinding":               "clusterrolebindings",
+	"ClusterTrustBundle":               "clustertrustbundles",
+	"ComponentStatus":                  "componentstatuses",
+	"ConfigMap":                        "configmaps",
+	"ControllerRevision":               "controllerrevisions",
+	"CronJob":                          "cronjobs",
+	"CSIDriver":                        "csidrivers",
+	"CSINode":                          "csinodes",
+	"CSIStorageCapacity":               "csistoragecapacities",
+	"CustomResourceDefinition":         "customresourcedefinitions",
+	"DaemonSet":                        "daemonsets",
+	"Deployment":                       "deployments",
+	"DeviceClass":                      "deviceclasses",
+	"Endpoints":                        "endpoints",
+	"EndpointSlice":                    "endpointslices",
+	"Event":                            "events",
+	"FlowSchema":                       "flowschemas",
+	"HorizontalPodAutoscaler":          "horizontalpodautoscalers",
+	"Ingress":                          "ingresses",
+	"IngressClass":                     "ingressclasses",
+	"IPAddress":                        "ipaddresses",
+	"Job":                              "jobs",
+	"Lease":                            "leases",
+	"LeaseCandidate":                   "leasecandidates",
+	"LimitRange":                       "limitranges",
+	"LocalSubjectAccessReview":         "localsubjectaccessreviews",
+	"MutatingAdmissionPolicy":          "mutatingadmissionpolicies",
+	"MutatingAdmissionPolicyBinding":   "mutatingadmissionpolicybindings",
+	"MutatingWebhookConfiguration":     "mutatingwebhookconfigurations",
+	"Namespace":                        "namespaces",
+	"NetworkPolicy":                    "networkpolicies",
+	"Node":                             "nodes",
+	"NodeMetrics":                      "nodes",
+	"PersistentVolume":                 "persistentvolumes",
+	"PersistentVolumeClaim":            "persistentvolumeclaims",
+	"Pod":                              "pods",
+	"PodDisruptionBudget":              "poddisruptionbudgets",
+	"PodMetrics":                       "pods",
+	"PodPreset":                        "podpresets",
+	"PodSchedulingContext":             "podschedulingcontexts",
+	"PodSecurityPolicy":                "podsecuritypolicies",
+	"PodTemplate":                      "podtemplates",
+	"PriorityClass":                    "priorityclasses",
+	"PriorityLevelConfiguration":       "prioritylevelconfigurations",
+	"ReplicaSet":                       "replicasets",
+	"ReplicationController":            "replicationcontrollers",
+	"ResourceClaim":                    "resourceclaims",
+	"ResourceClaimParameters":          "resourceclaimparameters",
+	"ResourceClaimTemplate":            "resourceclaimtemplates",
+	"ResourceClass":                    "resourceclasses",
+	"ResourceClassParameters":          "resourceclassparameters",
+	"ResourceQuota":                    "resourcequotas",
+	"ResourceSlice":                    "resourceslices",
+	"Role":                             "roles",
+	"RoleBinding":                      "rolebindings",
+	"RuntimeClass":                     "runtimeclasses",
+	"Secret":                           "secrets",
+	"SelfSubjectAccessReview":          "selfsubjectaccessreviews",
+	"SelfSubjectReview":                "selfsubjectreviews",
+	"SelfSubjectRulesReview":           "selfsubjectrulesreviews",
+	"Service":                          "services",
+	"ServiceAccount":                   "serviceaccounts",
+	"ServiceCIDR":                      "servicecidrs",
+	"StatefulSet":                      "statefulsets",
+	"StorageClass":                     "storageclasses",
+	"StorageVersion":                   "storageversions",
+	"StorageVersionMigration":          "storageversionmigrations",
+	"SubjectAccessReview":              "subjectaccessreviews",
+	"TokenRequest":                     "tokenrequests",
+	"TokenReview":                      "tokenreviews",
+	"ValidatingAdmissionPolicy":        "validatingadmissionpolicies",
+	"ValidatingAdmissionPolicyBinding": "validatingadmissionpolicybindings",
+	"ValidatingWebhookConfiguration":   "validatingwebhookconfigurations",
+	"VolumeAttachment":                 "volumeattachments",
+	"VolumeAttributesClass":            "volumeattributesclasses",
 ]
 
 let ShortNames = [
+	"Certificate":                    "cert",
+	"CertificateRequest":             "cr",
 	"CertificateSigningRequest":      "csr",
 	"ComponentStatus":                "cs",
 	"ConfigMap":                      "cm",
@@ -169,33 +171,34 @@ let ShortNames = [
 	"ServiceAccount":                 "sa",
 	"StatefulSet":                    "sts",
 	"StorageClass":                   "sc",
+	"ScheduledScaler":                "ss",
 ]
 
 let APIGroups = [
-    "admissionregistration.k8s.io":   "AdmissionRegistration",
-    "apiextensions.k8s.io":           "APIExtensions",
-    "apiregistration.k8s.io":         "APIRegistration",
-    "apps":                           "Apps",
-    "authentication.k8s.io":          "Authentication",
-    "authorization.k8s.io":           "Authorization",
-    "autoscaling":                    "AutoScaling",
-    "batch":                          "Batch",
-    "certificates.k8s.io":            "Certificates",
-    "coordination.k8s.io":            "Coordination",
-    "core":                           "Core",
-    "discovery.k8s.io":               "Discovery",
-    "events.k8s.io":                  "Events",
-    "extensions":                     "Extensions",
-    "flowcontrol.apiserver.k8s.io":   "FlowControl",
-    "internal.apiserver.k8s.io":      "Internal",
-    "networking.k8s.io":              "Networking",
-    "node.k8s.io":                    "Node",
-    "policy":                         "Policy",
-    "rbac.authorization.k8s.io":      "RBAC",
-    "resource.k8s.io":                "Resource",
-    "scheduling.k8s.io":              "Scheduling",
-    "storage.k8s.io":                 "Storage",
-    "storagemigration.k8s.io":        "StorageVersionMigration"
+	"admissionregistration.k8s.io":   "AdmissionRegistration",
+	"apiextensions.k8s.io":           "APIExtensions",
+	"apiregistration.k8s.io":         "APIRegistration",
+	"apps":                           "Apps",
+	"authentication.k8s.io":          "Authentication",
+	"authorization.k8s.io":           "Authorization",
+	"autoscaling":                    "AutoScaling",
+	"batch":                          "Batch",
+	"certificates.k8s.io":            "Certificates",
+	"coordination.k8s.io":            "Coordination",
+	"core":                           "Core",
+	"discovery.k8s.io":               "Discovery",
+	"events.k8s.io":                  "Events",
+	"extensions":                     "Extensions",
+	"flowcontrol.apiserver.k8s.io":   "FlowControl",
+	"internal.apiserver.k8s.io":      "Internal",
+	"networking.k8s.io":              "Networking",
+	"node.k8s.io":                    "Node",
+	"policy":                         "Policy",
+	"rbac.authorization.k8s.io":      "RBAC",
+	"resource.k8s.io":                "Resource",
+	"scheduling.k8s.io":              "Scheduling",
+	"storage.k8s.io":                 "Storage",
+	"storagemigration.k8s.io":        "StorageVersionMigration"
 ]
 
 let Keywords = Set(["continue", "default", "internal", "operator", "protocol"])