Save canon input strucutres for config generator tests

pkg/canonize/canonize.go

@@ -7,6 +7,8 @@ import (
 	"strings"
 	"testing"
 
+	"sigs.k8s.io/yaml"
+
 	"github.com/pmezard/go-difflib/difflib"
 )
 
@@ -19,7 +21,7 @@ const (
 )
 
 func Assert(t *testing.T, data []byte) {
-	canonFilePath := getCanonFilePath(t)
+	canonFilePath := getCanonFilePath(t, canonFileName)
 
 	if isCanonizeNeeded() {
 		err := writeCanonData(canonFilePath, data)
@@ -51,6 +53,45 @@ func Assert(t *testing.T, data []byte) {
 	}
 }
 
+func AssertStruct(t *testing.T, name string, s any) {
+	canonFilePath := getCanonFilePath(t, name+".yaml")
+
+	data, err := yaml.Marshal(s)
+	if err != nil {
+		t.Errorf("can't encode data with error: %q", err.Error())
+		t.FailNow()
+		return
+	}
+
+	if isCanonizeNeeded() {
+		err := writeCanonData(canonFilePath, data)
+		if err != nil {
+			t.Errorf("can't write canon data with error: %q", err.Error())
+			t.FailNow()
+			return
+		}
+	}
+
+	canonData, err := readCanonData(canonFilePath)
+	if err != nil {
+		t.Errorf("can't read canon data with error: %q", err.Error())
+		t.FailNow()
+		return
+	}
+
+	diff := difflib.UnifiedDiff{
+		A:        difflib.SplitLines(string(canonData)),
+		B:        difflib.SplitLines(string(data)),
+		FromFile: "old",
+		ToFile:   "new",
+		Context:  3,
+	}
+	text, _ := difflib.GetUnifiedDiffString(diff)
+	if text != "" {
+		t.Errorf("%s", addColorsToDiff(text))
+	}
+}
+
 func readCanonData(canonFilePath string) ([]byte, error) {
 	if _, err := os.Stat(canonFilePath); err != nil {
 		if os.IsNotExist(err) {
@@ -89,6 +130,6 @@ func createCanonDirsIfNeeded(canonFilePath string) error {
 	return err
 }
 
-func getCanonFilePath(t *testing.T) string {
-	return filepath.Join(canonDirName, t.Name(), canonFileName)
+func getCanonFilePath(t *testing.T, fileName string) string {
+	return filepath.Join(canonDirName, t.Name(), fileName)
 }

pkg/ytconfig/canondata/TestGetContainerdConfig/exec-node.yaml

@@ -0,0 +1,58 @@
+instanceCount: 50
+jobEnvironment:
+  cri:
+    apiRetryTimeoutSeconds: 120
+    baseCgroup: /yt
+    criNamespace: yt
+    sandboxImage: registry.k8s.io/pause:3.8
+  doNotSetUserId: true
+  isolated: false
+  useArtifactBinds: true
+  userSlots: 42
+jobProxyLoggers:
+- categoriesFilter:
+    type: exclude
+    values:
+    - Bus
+    - Concurrency
+  compression: zstd
+  format: plain_text
+  minLogLevel: debug
+  name: debug
+  rotationPolicy:
+    maxTotalSizeToKeep: "3145728"
+    rotationPeriodMilliseconds: 900000
+  useTimestampSuffix: false
+  writerType: file
+locations:
+- locationType: ChunkCache
+  path: /yt/hdd1/chunk-cache
+- locationType: Slots
+  path: /yt/hdd2/slots
+  quota: 5Gi
+- locationType: ImageCache
+  path: /yt/hdd1/images
+  quota: 4Gi
+monitoringPort: 10029
+name: end-a
+privileged: false
+rack: fake
+resources:
+  limits:
+    cpu: "20"
+    memory: 5Gi
+tags:
+- rack:xn-a
+volumeClaimTemplates:
+- metadata:
+    name: hdd1
+  spec:
+    accessModes:
+    - ReadWriteOnce
+    resources:
+      requests:
+        storage: 10Gi
+    storageClassName: yc-network-hdd
+volumeMounts:
+- mountPath: /yt/hdd1
+  name: hdd1

pkg/ytconfig/canondata/TestGetContainerdConfig/ytsaurus.yaml

@@ -0,0 +1,129 @@
+metadata:
+  creationTimestamp: null
+  name: test
+  namespace: fake
+spec:
+  controllerAgents:
+    instanceCount: 3
+    monitoringPort: 10014
+    resources: {}
+  discovery:
+    instanceCount: 3
+    monitoringPort: 10020
+    resources: {}
+  enableFullUpdate: false
+  hostNetwork: false
+  isManaged: false
+  kafkaProxies:
+  - instanceCount: 3
+    monitoringPort: 10033
+    resources: {}
+  masterCaches:
+    cellTagMasterCaches: 0
+    instanceCount: 3
+    monitoringPort: 10018
+    resources: {}
+  oauthService:
+    host: oauth-host
+    port: 433
+    secure: true
+    userInfoHandler:
+      endpoint: user-info-endpoint
+      loginField: login
+      loginTransformations:
+      - matchPattern: (.*)@ytsaurus.team
+        replacement: \1
+  primaryMasters:
+    cellTag: 0
+    instanceCount: 1
+    locations:
+    - locationType: MasterChangelogs
+      path: /yt/master-data/master-changelogs
+    - locationType: MasterSnapshots
+      path: /yt/master-data/master-snapshots
+    loggers:
+    - compression: none
+      format: plain_text
+      minLogLevel: info
+      name: info
+      useTimestampSuffix: false
+      writerType: file
+    - compression: none
+      format: plain_text
+      minLogLevel: error
+      name: error
+      useTimestampSuffix: false
+      writerType: file
+    - categoriesFilter:
+        type: exclude
+        values:
+        - Bus
+      compression: zstd
+      format: plain_text
+      minLogLevel: debug
+      name: debug
+      rotationPolicy:
+        maxTotalSizeToKeep: 10Gi
+        rotationPeriodMilliseconds: 900000
+      useTimestampSuffix: false
+      writerType: file
+    maxSnapshotCountToKeep: 1543
+    monitoringPort: 10010
+    resources: {}
+    sidecars:
+    - '{name: sleep, image: fakeimage:stable, command: [/bin/sleep], args: [inf]}'
+    volumeClaimTemplates:
+    - metadata:
+        name: master-data
+      spec:
+        accessModes:
+        - ReadWriteOnce
+        resources:
+          requests:
+            storage: 20Gi
+    volumeMounts:
+    - mountPath: /yt/master-data
+      name: master-data
+  queryTrackers:
+    instanceCount: 3
+    monitoringPort: 10028
+    resources: {}
+  queueAgents:
+    instanceCount: 3
+    monitoringPort: 10030
+    resources: {}
+  schedulers:
+    instanceCount: 3
+    monitoringPort: 10011
+    resources: {}
+  strawberry:
+    image: dummy-strawberry-image
+    resources:
+      limits:
+        cpu: "20"
+        memory: 5Gi
+  tcpProxies:
+  - instanceCount: 3
+    minPort: 10000
+    monitoringPort: 10017
+    portCount: 20000
+    resources: {}
+  ui:
+    image: dummy-ui-image
+    odinBaseUrl: http://odin-webservice.odin.svc.cluster.local
+    resources: {}
+    secure: false
+    serviceType: NodePort
+    useInsecureCookies: false
+  updateSelector: ""
+  useIpv4: true
+  useIpv6: false
+  usePorto: true
+  useShortNames: false
+  yqlAgents:
+    configureMrJobSystemLibs: false
+    instanceCount: 3
+    monitoringPort: 10019
+    resources: {}
+status:
+  updateStatus: {}

pkg/ytconfig/canondata/TestGetControllerAgentsConfig/ytsaurus.yaml

@@ -0,0 +1,129 @@
+metadata:
+  creationTimestamp: null
+  name: test
+  namespace: fake
+spec:
+  controllerAgents:
+    instanceCount: 3
+    monitoringPort: 10014
+    resources: {}
+  discovery:
+    instanceCount: 3
+    monitoringPort: 10020
+    resources: {}
+  enableFullUpdate: false
+  hostNetwork: false
+  isManaged: false
+  kafkaProxies:
+  - instanceCount: 3
+    monitoringPort: 10033
+    resources: {}
+  masterCaches:
+    cellTagMasterCaches: 0
+    instanceCount: 3
+    monitoringPort: 10018
+    resources: {}
+  oauthService:
+    host: oauth-host
+    port: 433
+    secure: true
+    userInfoHandler:
+      endpoint: user-info-endpoint
+      loginField: login
+      loginTransformations:
+      - matchPattern: (.*)@ytsaurus.team
+        replacement: \1
+  primaryMasters:
+    cellTag: 0
+    instanceCount: 1
+    locations:
+    - locationType: MasterChangelogs
+      path: /yt/master-data/master-changelogs
+    - locationType: MasterSnapshots
+      path: /yt/master-data/master-snapshots
+    loggers:
+    - compression: none
+      format: plain_text
+      minLogLevel: info
+      name: info
+      useTimestampSuffix: false
+      writerType: file
+    - compression: none
+      format: plain_text
+      minLogLevel: error
+      name: error
+      useTimestampSuffix: false
+      writerType: file
+    - categoriesFilter:
+        type: exclude
+        values:
+        - Bus
+      compression: zstd
+      format: plain_text
+      minLogLevel: debug
+      name: debug
+      rotationPolicy:
+        maxTotalSizeToKeep: 10Gi
+        rotationPeriodMilliseconds: 900000
+      useTimestampSuffix: false
+      writerType: file
+    maxSnapshotCountToKeep: 1543
+    monitoringPort: 10010
+    resources: {}
+    sidecars:
+    - '{name: sleep, image: fakeimage:stable, command: [/bin/sleep], args: [inf]}'
+    volumeClaimTemplates:
+    - metadata:
+        name: master-data
+      spec:
+        accessModes:
+        - ReadWriteOnce
+        resources:
+          requests:
+            storage: 20Gi
+    volumeMounts:
+    - mountPath: /yt/master-data
+      name: master-data
+  queryTrackers:
+    instanceCount: 3
+    monitoringPort: 10028
+    resources: {}
+  queueAgents:
+    instanceCount: 3
+    monitoringPort: 10030
+    resources: {}
+  schedulers:
+    instanceCount: 3
+    monitoringPort: 10011
+    resources: {}
+  strawberry:
+    image: dummy-strawberry-image
+    resources:
+      limits:
+        cpu: "20"
+        memory: 5Gi
+  tcpProxies:
+  - instanceCount: 3
+    minPort: 10000
+    monitoringPort: 10017
+    portCount: 20000
+    resources: {}
+  ui:
+    image: dummy-ui-image
+    odinBaseUrl: http://odin-webservice.odin.svc.cluster.local
+    resources: {}
+    secure: false
+    serviceType: NodePort
+    useInsecureCookies: false
+  updateSelector: ""
+  useIpv4: true
+  useIpv6: false
+  usePorto: true
+  useShortNames: false
+  yqlAgents:
+    configureMrJobSystemLibs: false
+    instanceCount: 3
+    monitoringPort: 10019
+    resources: {}
+status:
+  updateStatus: {}