From 3ef191ac950d2a49659a970c88d72f192620c004 Mon Sep 17 00:00:00 2001 From: corymhall <43035978+corymhall@users.noreply.github.com> Date: Wed, 11 Sep 2024 15:41:46 -0400 Subject: [PATCH] tests are failing --- Makefile | 3 ++- nodejs/eks/cmd/provider/cni.ts | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 46ffecc2a..f4fee1963 100644 --- a/Makefile +++ b/Makefile @@ -181,7 +181,8 @@ test_nodejs:: provider install_nodejs_sdk test_nodejs_upgrade:: PATH := $(WORKING_DIR)/bin:$(PATH) test_nodejs_upgrade:: provider install_nodejs_sdk - cd provider && go test -tags=nodejs -v -json -count=1 -cover -timeout 3h -parallel ${TESTPARALLELISM} . 2>&1 | tee /tmp/gotest.log | gotestfmt + # cd provider && go test -tags=nodejs -v -json -count=1 -cover -timeout 3h -parallel ${TESTPARALLELISM} . 2>&1 | tee /tmp/gotest.log | gotestfmt + cd provider && go test -tags=nodejs -v -count=1 -cover -timeout 3h -parallel ${TESTPARALLELISM} . test_python:: install_provider test_build cd examples && go test -tags=python -v -json -count=1 -cover -timeout 3h -parallel ${TESTPARALLELISM} . 2>&1 | tee /tmp/gotest.log | gotestfmt diff --git a/nodejs/eks/cmd/provider/cni.ts b/nodejs/eks/cmd/provider/cni.ts index ccfaebfab..461bb86af 100644 --- a/nodejs/eks/cmd/provider/cni.ts +++ b/nodejs/eks/cmd/provider/cni.ts @@ -252,13 +252,12 @@ function applyVpcCniYaml(args: VpcCniInputs): string { // Check to ensure that a compatible kubectl is installed, as we'll need it in order to deploy k8s resources below. assertCompatibleKubectlVersionExists(); - const kubeconfig = pulumi.output(args.kubeconfig).apply(config => typeof config === "string" ? config : JSON.stringify(config)); + const kubeconfig: string = + typeof args.kubeconfig === "string" ? args.kubeconfig : JSON.stringify(args.kubeconfig); // Dump the kubeconfig to a file. const tmpKubeconfig = tmp.fileSync(); - kubeconfig.apply(config => { - fs.writeFileSync(tmpKubeconfig.fd, config); - }) + fs.writeFileSync(tmpKubeconfig.fd, kubeconfig); // Compute the required CNI YAML and dump it to a file. const tmpYaml = tmp.fileSync();