Skip to content

Commit 7b5a1ea

Browse files
committed
fix(tests): v2 wip
1 parent 1c7defb commit 7b5a1ea

File tree

3 files changed

+42
-51
lines changed

3 files changed

+42
-51
lines changed

pkg/node/process.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type ProcessManager struct {
2222
gcInterval time.Duration
2323
idleTimeout time.Duration
2424
tempDir string
25-
logger logger.LogrusLogger
25+
logger logger.Logger
2626
healthCheckWait time.Duration
2727
healthCheckInterval time.Duration
2828
requestTimeout time.Duration
Lines changed: 35 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,53 @@
1-
import { logger, FieldRef, v1 } from "@crossplane-js/sdk"
2-
import type { CrossplaneDesiredResources, CrossplaneObservedResources } from "@crossplane-js/sdk"
1+
import {
2+
logger,
3+
// FieldRef,
4+
v1,
5+
} from '@crossplane-js/sdk'
6+
import type {
7+
CrossplaneDesiredResources,
8+
// CrossplaneObservedResources
9+
} from '@crossplane-js/sdk'
310

4-
import type { SimpleConfigMap } from "@/models/test.crossplane.io/v1beta1"
11+
import type { SimpleConfigMap } from '../../models/test.crossplane.io/v1beta1'
512

6-
export default function(composite: SimpleConfigMap, _resources: CrossplaneObservedResources): CrossplaneDesiredResources {
7-
logger.info("Composition function started")
13+
export default function (
14+
composite: SimpleConfigMap
15+
// resources: CrossplaneObservedResources
16+
): CrossplaneDesiredResources {
17+
logger.info('SimpleConfigMap composition function started')
18+
logger.info(`composite:${JSON.stringify(composite)}`)
819

920
const namespace = composite.getNamespace()
1021
const isReady = composite.isReady()
1122

12-
logger.info(`Ready: ${isReady}`)
23+
logger.info(`Namespace: ${namespace}, Ready: ${isReady}`)
1324
logger.info(composite)
14-
15-
const data = composite.spec.data;
16-
logger.info({ data }, "Input data")
17-
18-
const uppercaseData: Record<string, string> = {};
19-
for (const key in data) {
20-
uppercaseData[key.toUpperCase()] = data[key].toUpperCase();
21-
}
22-
25+
26+
// Transform data to uppercase for testing (same as original test logic)
27+
const transformedData: Record<string, string> = {}
28+
Object.entries(composite.spec.data).forEach(([key, value]) => {
29+
transformedData[key.toUpperCase()] = value.toUpperCase()
30+
})
31+
2332
const testConfigMap = new v1.ConfigMap({
2433
metadata: {
25-
name: "generated-configmap",
26-
namespace: namespace,
27-
labels: {
28-
example: "true"
29-
},
30-
},
31-
data: {
32-
...uppercaseData,
33-
// hello: new FieldRef<string>(composite, "$.status.conditions[?(@.type=='Ready')].status", ""),
34+
name: 'generated-configmap',
35+
namespace: namespace || 'test-xfuncjs',
3436
},
37+
data: transformedData,
3538
})
3639

37-
const desired = {
40+
const desired: CrossplaneDesiredResources = {
3841
resources: {
3942
configmap: {
40-
resource: {
41-
apiVersion: "kubernetes.crossplane.io/v1alpha1",
42-
kind: "Object",
43-
metadata: {
44-
// name: `${composite.getName()}-configmap`,
45-
name: `generated-configmap`,
46-
annotations: {
47-
"uptest.upbound.io/timeout": "60"
48-
}
49-
},
50-
spec: {
51-
forProvider: {
52-
manifest: testConfigMap,
53-
},
54-
providerConfigRef: {
55-
// name: "in-cluster",
56-
name: "default",
57-
},
58-
},
59-
},
43+
resource: testConfigMap,
44+
ready: true,
6045
},
6146
},
6247
}
63-
64-
logger.info("Composition function completed")
65-
logger.debug({ desired }, "Generated output")
66-
67-
return desired;
48+
49+
logger.info('SimpleConfigMap composition function completed')
50+
logger.debug({ desired }, 'Generated output')
51+
52+
return desired
6853
}

tests/fixtures/domain-sdk/functions/simpleconfigmaps/xrd.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ metadata:
44
name: simpleconfigmaps.test.crossplane.io
55
spec:
66
scope: Namespaced
7+
defaultCompositeDeletePolicy: Foreground
78
group: test.crossplane.io
89
names:
10+
categories:
11+
- crossplane
912
kind: SimpleConfigMap
1013
plural: simpleconfigmaps
1114
singular: simpleconfigmap
@@ -22,5 +25,8 @@ spec:
2225
properties:
2326
data:
2427
type: object
28+
description: Key-value data to be transformed and stored in ConfigMap
2529
additionalProperties:
2630
type: string
31+
required:
32+
- data

0 commit comments

Comments
 (0)