Skip to content

Commit 0221823

Browse files
iabudiabiabudiab
committed
Format code
1 parent 458caf1 commit 0221823

File tree

4 files changed

+119
-116
lines changed

4 files changed

+119
-116
lines changed

‎Package.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
"repositoryURL": "https://github.com/apple/swift-argument-parser",
4343
"state": {
4444
"branch": null,
45-
"revision": "fddd1c00396eed152c45a46bea9f47b98e59301d",
46-
"version": "1.2.0"
45+
"revision": "fee6933f37fde9a5e12a1e4aeaa93fe60116ff2a",
46+
"version": "1.2.2"
4747
}
4848
}
4949
]

‎Sources/SwiftkubeModelGen/Model/GroupVersionKind.swift

+8-8
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ struct GroupVersionKind: Decodable, Hashable {
3939

4040
var renderedGroup: String {
4141
(group == "" || group == "core")
42-
? "core"
43-
: "\(group)"
42+
? "core"
43+
: "\(group)"
4444
}
4545

4646
var renderedVersion: String {
@@ -59,8 +59,8 @@ struct GroupVersionKind: Decodable, Hashable {
5959

6060
var renderedFull: String {
6161
(group == "" || group == "core")
62-
? "\(version)/\(kind)"
63-
: "\(group)/\(version)/\(kind)"
62+
? "\(version)/\(kind)"
63+
: "\(group)/\(version)/\(kind)"
6464
}
6565

6666
var renderedTypeCase: String {
@@ -183,13 +183,13 @@ struct GroupVersion: Decodable, Hashable {
183183

184184
var renderedType: String {
185185
(group == "" || group == "core")
186-
? "Core\(version.capitalized)"
187-
: "\(APIGroups[group]!)\(version.capitalized)"
186+
? "Core\(version.capitalized)"
187+
: "\(APIGroups[group]!)\(version.capitalized)"
188188
}
189189

190190
var renderedRaw: String {
191191
(group == "" || group == "core")
192-
? "core.\(version)"
193-
: "\(group).\(version)"
192+
? "core.\(version)"
193+
: "\(group).\(version)"
194194
}
195195
}

‎Sources/SwiftkubeModelGen/Model/Property.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ indirect enum PropertyType: Equatable {
140140
return "\(group).\(typeReference.version).\(typeReference.kind)"
141141
}
142142
case .any:
143-
return "JsonField"
143+
return "JSONField"
144144
default:
145145
return "UNKNOWN"
146146
}

‎Sources/SwiftkubeModelGen/Model/Types.swift

+108-105
Original file line numberDiff line numberDiff line change
@@ -57,90 +57,92 @@ let IgnoredSchemaTypes = Set([
5757
])
5858

5959
let PluralNames = [
60-
"APIService": "apiservices",
61-
"AuditSink": "auditsinks",
62-
"Binding": "bindings",
63-
"CertificateSigningRequest": "certificatesigningrequests",
64-
"ClusterCIDR": "clustercidrs",
65-
"ClusterRole": "clusterroles",
66-
"ClusterRoleBinding": "clusterrolebindings",
67-
"ClusterTrustBundle": "clustertrustbundles",
68-
"ComponentStatus": "componentstatuses",
69-
"ConfigMap": "configmaps",
70-
"ControllerRevision": "controllerrevisions",
71-
"CronJob": "cronjobs",
72-
"CSIDriver": "csidrivers",
73-
"CSINode": "csinodes",
74-
"CSIStorageCapacity": "csistoragecapacities",
75-
"CustomResourceDefinition": "customresourcedefinitions",
76-
"DaemonSet": "daemonsets",
77-
"Deployment": "deployments",
78-
"DeviceClass": "deviceclasses",
79-
"Endpoints": "endpoints",
80-
"EndpointSlice": "endpointslices",
81-
"Event": "events",
82-
"FlowSchema": "flowschemas",
83-
"HorizontalPodAutoscaler": "horizontalpodautoscalers",
84-
"Ingress": "ingresses",
85-
"IngressClass": "ingressclasses",
86-
"IPAddress": "ipaddresses",
87-
"Job": "jobs",
88-
"Lease": "leases",
89-
"LeaseCandidate": "leasecandidates",
90-
"LimitRange": "limitranges",
91-
"LocalSubjectAccessReview": "localsubjectaccessreviews",
92-
"MutatingAdmissionPolicy": "mutatingadmissionpolicies",
93-
"MutatingAdmissionPolicyBinding": "mutatingadmissionpolicybindings",
94-
"MutatingWebhookConfiguration": "mutatingwebhookconfigurations",
95-
"Namespace": "namespaces",
96-
"NetworkPolicy": "networkpolicies",
97-
"Node": "nodes",
98-
"NodeMetrics": "nodes",
99-
"PersistentVolume": "persistentvolumes",
100-
"PersistentVolumeClaim": "persistentvolumeclaims",
101-
"Pod": "pods",
102-
"PodDisruptionBudget": "poddisruptionbudgets",
103-
"PodMetrics": "pods",
104-
"PodPreset": "podpresets",
105-
"PodSchedulingContext": "podschedulingcontexts",
106-
"PodSecurityPolicy": "podsecuritypolicies",
107-
"PodTemplate": "podtemplates",
108-
"PriorityClass": "priorityclasses",
109-
"PriorityLevelConfiguration": "prioritylevelconfigurations",
110-
"ReplicaSet": "replicasets",
111-
"ReplicationController": "replicationcontrollers",
112-
"ResourceClaim": "resourceclaims",
113-
"ResourceClaimParameters": "resourceclaimparameters",
114-
"ResourceClaimTemplate": "resourceclaimtemplates",
115-
"ResourceClass": "resourceclasses",
116-
"ResourceClassParameters": "resourceclassparameters",
117-
"ResourceQuota": "resourcequotas",
118-
"ResourceSlice": "resourceslices",
119-
"Role": "roles",
120-
"RoleBinding": "rolebindings",
121-
"RuntimeClass": "runtimeclasses",
122-
"Secret": "secrets",
123-
"SelfSubjectAccessReview": "selfsubjectaccessreviews",
124-
"SelfSubjectReview": "selfsubjectreviews",
125-
"SelfSubjectRulesReview": "selfsubjectrulesreviews",
126-
"Service": "services",
127-
"ServiceAccount": "serviceaccounts",
128-
"ServiceCIDR": "servicecidrs",
129-
"StatefulSet": "statefulsets",
130-
"StorageClass": "storageclasses",
131-
"StorageVersion": "storageversions",
132-
"StorageVersionMigration": "storageversionmigrations",
133-
"SubjectAccessReview": "subjectaccessreviews",
134-
"TokenRequest": "tokenrequests",
135-
"TokenReview": "tokenreviews",
136-
"ValidatingAdmissionPolicy": "validatingadmissionpolicies",
137-
"ValidatingAdmissionPolicyBinding": "validatingadmissionpolicybindings",
138-
"ValidatingWebhookConfiguration": "validatingwebhookconfigurations",
139-
"VolumeAttachment": "volumeattachments",
140-
"VolumeAttributesClass": "volumeattributesclasses",
60+
"APIService": "apiservices",
61+
"AuditSink": "auditsinks",
62+
"Binding": "bindings",
63+
"CertificateSigningRequest": "certificatesigningrequests",
64+
"ClusterCIDR": "clustercidrs",
65+
"ClusterRole": "clusterroles",
66+
"ClusterRoleBinding": "clusterrolebindings",
67+
"ClusterTrustBundle": "clustertrustbundles",
68+
"ComponentStatus": "componentstatuses",
69+
"ConfigMap": "configmaps",
70+
"ControllerRevision": "controllerrevisions",
71+
"CronJob": "cronjobs",
72+
"CSIDriver": "csidrivers",
73+
"CSINode": "csinodes",
74+
"CSIStorageCapacity": "csistoragecapacities",
75+
"CustomResourceDefinition": "customresourcedefinitions",
76+
"DaemonSet": "daemonsets",
77+
"Deployment": "deployments",
78+
"DeviceClass": "deviceclasses",
79+
"Endpoints": "endpoints",
80+
"EndpointSlice": "endpointslices",
81+
"Event": "events",
82+
"FlowSchema": "flowschemas",
83+
"HorizontalPodAutoscaler": "horizontalpodautoscalers",
84+
"Ingress": "ingresses",
85+
"IngressClass": "ingressclasses",
86+
"IPAddress": "ipaddresses",
87+
"Job": "jobs",
88+
"Lease": "leases",
89+
"LeaseCandidate": "leasecandidates",
90+
"LimitRange": "limitranges",
91+
"LocalSubjectAccessReview": "localsubjectaccessreviews",
92+
"MutatingAdmissionPolicy": "mutatingadmissionpolicies",
93+
"MutatingAdmissionPolicyBinding": "mutatingadmissionpolicybindings",
94+
"MutatingWebhookConfiguration": "mutatingwebhookconfigurations",
95+
"Namespace": "namespaces",
96+
"NetworkPolicy": "networkpolicies",
97+
"Node": "nodes",
98+
"NodeMetrics": "nodes",
99+
"PersistentVolume": "persistentvolumes",
100+
"PersistentVolumeClaim": "persistentvolumeclaims",
101+
"Pod": "pods",
102+
"PodDisruptionBudget": "poddisruptionbudgets",
103+
"PodMetrics": "pods",
104+
"PodPreset": "podpresets",
105+
"PodSchedulingContext": "podschedulingcontexts",
106+
"PodSecurityPolicy": "podsecuritypolicies",
107+
"PodTemplate": "podtemplates",
108+
"PriorityClass": "priorityclasses",
109+
"PriorityLevelConfiguration": "prioritylevelconfigurations",
110+
"ReplicaSet": "replicasets",
111+
"ReplicationController": "replicationcontrollers",
112+
"ResourceClaim": "resourceclaims",
113+
"ResourceClaimParameters": "resourceclaimparameters",
114+
"ResourceClaimTemplate": "resourceclaimtemplates",
115+
"ResourceClass": "resourceclasses",
116+
"ResourceClassParameters": "resourceclassparameters",
117+
"ResourceQuota": "resourcequotas",
118+
"ResourceSlice": "resourceslices",
119+
"Role": "roles",
120+
"RoleBinding": "rolebindings",
121+
"RuntimeClass": "runtimeclasses",
122+
"Secret": "secrets",
123+
"SelfSubjectAccessReview": "selfsubjectaccessreviews",
124+
"SelfSubjectReview": "selfsubjectreviews",
125+
"SelfSubjectRulesReview": "selfsubjectrulesreviews",
126+
"Service": "services",
127+
"ServiceAccount": "serviceaccounts",
128+
"ServiceCIDR": "servicecidrs",
129+
"StatefulSet": "statefulsets",
130+
"StorageClass": "storageclasses",
131+
"StorageVersion": "storageversions",
132+
"StorageVersionMigration": "storageversionmigrations",
133+
"SubjectAccessReview": "subjectaccessreviews",
134+
"TokenRequest": "tokenrequests",
135+
"TokenReview": "tokenreviews",
136+
"ValidatingAdmissionPolicy": "validatingadmissionpolicies",
137+
"ValidatingAdmissionPolicyBinding": "validatingadmissionpolicybindings",
138+
"ValidatingWebhookConfiguration": "validatingwebhookconfigurations",
139+
"VolumeAttachment": "volumeattachments",
140+
"VolumeAttributesClass": "volumeattributesclasses",
141141
]
142142

143143
let ShortNames = [
144+
"Certificate": "cert",
145+
"CertificateRequest": "cr",
144146
"CertificateSigningRequest": "csr",
145147
"ComponentStatus": "cs",
146148
"ConfigMap": "cm",
@@ -169,33 +171,34 @@ let ShortNames = [
169171
"ServiceAccount": "sa",
170172
"StatefulSet": "sts",
171173
"StorageClass": "sc",
174+
"ScheduledScaler": "ss",
172175
]
173176

174177
let APIGroups = [
175-
"admissionregistration.k8s.io": "AdmissionRegistration",
176-
"apiextensions.k8s.io": "APIExtensions",
177-
"apiregistration.k8s.io": "APIRegistration",
178-
"apps": "Apps",
179-
"authentication.k8s.io": "Authentication",
180-
"authorization.k8s.io": "Authorization",
181-
"autoscaling": "AutoScaling",
182-
"batch": "Batch",
183-
"certificates.k8s.io": "Certificates",
184-
"coordination.k8s.io": "Coordination",
185-
"core": "Core",
186-
"discovery.k8s.io": "Discovery",
187-
"events.k8s.io": "Events",
188-
"extensions": "Extensions",
189-
"flowcontrol.apiserver.k8s.io": "FlowControl",
190-
"internal.apiserver.k8s.io": "Internal",
191-
"networking.k8s.io": "Networking",
192-
"node.k8s.io": "Node",
193-
"policy": "Policy",
194-
"rbac.authorization.k8s.io": "RBAC",
195-
"resource.k8s.io": "Resource",
196-
"scheduling.k8s.io": "Scheduling",
197-
"storage.k8s.io": "Storage",
198-
"storagemigration.k8s.io": "StorageVersionMigration"
178+
"admissionregistration.k8s.io": "AdmissionRegistration",
179+
"apiextensions.k8s.io": "APIExtensions",
180+
"apiregistration.k8s.io": "APIRegistration",
181+
"apps": "Apps",
182+
"authentication.k8s.io": "Authentication",
183+
"authorization.k8s.io": "Authorization",
184+
"autoscaling": "AutoScaling",
185+
"batch": "Batch",
186+
"certificates.k8s.io": "Certificates",
187+
"coordination.k8s.io": "Coordination",
188+
"core": "Core",
189+
"discovery.k8s.io": "Discovery",
190+
"events.k8s.io": "Events",
191+
"extensions": "Extensions",
192+
"flowcontrol.apiserver.k8s.io": "FlowControl",
193+
"internal.apiserver.k8s.io": "Internal",
194+
"networking.k8s.io": "Networking",
195+
"node.k8s.io": "Node",
196+
"policy": "Policy",
197+
"rbac.authorization.k8s.io": "RBAC",
198+
"resource.k8s.io": "Resource",
199+
"scheduling.k8s.io": "Scheduling",
200+
"storage.k8s.io": "Storage",
201+
"storagemigration.k8s.io": "StorageVersionMigration"
199202
]
200203

201204
let Keywords = Set(["continue", "default", "internal", "operator", "protocol"])

0 commit comments

Comments
 (0)