Merge pull request rancher-sandbox#9262 from mook-as/moby-openapi/breaksage/ipam-status

jandubois · web-flow · commit 6ea4d58ca62c · 2025-09-15T14:22:42.000-07:00
moby-openapi: Add new fixup
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
@@ -89,7 +89,6 @@ bpffs
 breadcrumb
 browserhome
 brucebean
-bsdextrautils
 bsdtar
 btime
 bugtracker
@@ -377,6 +376,7 @@ INSTALLMESSAGE
 INSTALLPROPERTY
 ioctl
 ipaddr
+IPAM
 iptable
 Isf
 islabel
diff --git a/scripts/dependencies/moby-openapi.ts b/scripts/dependencies/moby-openapi.ts
@@ -47,6 +47,10 @@ export class MobyOpenAPISpec extends GlobalDependency(VersionedDependency) {
     if (_.get(contents, 'definitions.Network.properties.Created.x-go-type.import.package') === 'time') {
       _.set(contents, 'definitions.Network.properties.Created.x-go-type.hints.noValidation', true);
     }
+    // Having the x-go-type here confuses swagger.
+    if (_.has(contents, 'definitions.IPAMStatus.properties.Subnets.x-go-type')) {
+      delete _.get(contents, 'definitions.IPAMStatus.properties.Subnets')['x-go-type'];
+    }
 
     await fs.promises.writeFile(modifiedPath, yaml.stringify(contents), 'utf-8');
 

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,10 @@ export class MobyOpenAPISpec extends GlobalDependency(VersionedDependency) {`
`47`	`47`	`if (_.get(contents, 'definitions.Network.properties.Created.x-go-type.import.package') === 'time') {`
`48`	`48`	`_.set(contents, 'definitions.Network.properties.Created.x-go-type.hints.noValidation', true);`
`49`	`49`	`}`
	`50`	`+ // Having the x-go-type here confuses swagger.`
	`51`	`+ if (_.has(contents, 'definitions.IPAMStatus.properties.Subnets.x-go-type')) {`
	`52`	`+ delete _.get(contents, 'definitions.IPAMStatus.properties.Subnets')['x-go-type'];`
	`53`	`+ }`
`50`	`54`
`51`	`55`	`await fs.promises.writeFile(modifiedPath, yaml.stringify(contents), 'utf-8');`
`52`	`56`