From nobody Wed Jun 05 09:03:08 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VvM1m53gDz5MDnN; Wed, 05 Jun 2024 09:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VvM1m3TFZz4Nsp; Wed, 5 Jun 2024 09:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717578188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hJjLDUJ2Z5TZmPXnvrnKdl1HkiDae8MLD+N1xBYPAvI=; b=Fbort4erLUOw3UN9hQKqWngHLpaFBxCnUwOXuicYFxj7Iol0oMCtkhvnU4eqhCNDHEyKRW 7IMEHoCBjuBC6MdATfQlEon1aFQGKsIRjQyR7wWCbbp2nZlTwcnnso2ybhXiitRbCf/pCh p4xlvq5dCyE+sWLIxn6zI2Fx1UTWHq4R6ivB9ItolXmS7bRGnAboXzd4d69UyI17HKdaqv vlYxYDjET/ZlHBzvyiLzF5ah4qV0/AboWsZMe5thlO6fLHGFh0AdWYUZBfo5r0UdTdhVve bD1KomPJ+aCyq7990M4lF5aHmUhPJEeqhrORTM3ygOHgmAqpEoqT5IWGy/RUYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717578188; a=rsa-sha256; cv=none; b=is79cM7Wmol+vICJkeUtgg8ZVv3gv78jjf1u/0BWnn9bJ/+g5Nb3TGdHIBjZprWeHcyF3v 9pKgPqJCv5mEXe6gpXWYdr8scALwmaDqirlaTIX8aX1ikZ8s65nzHkVoEUPuiZ9uQwcx6X uPmqVm+lh3w3Itogz++qCEfSJbFEiVOugORAMvQV7d6q/FG232AXbyY/i8N945+/fG5Xal Zyn07APMqefaJwVEXTwcZiG64J5/BOqXj2W2KyOfZUpPkvrm0FqL+wuGgXMuG0O4V2mI6E RqLI/Fcrwai8xH/47u1GgxKgfhWmuilZV9owlqRP9zCzCehyb7bpNvhXvlJBVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717578188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hJjLDUJ2Z5TZmPXnvrnKdl1HkiDae8MLD+N1xBYPAvI=; b=T70FitsJfgL3qAFMMXKZcL8LeUv9uKp2/tIqLp/bY1DKzCrmJdf1FgcxMuKTz7d8mdjG+R 6arOOJ1F3ugCyarkFMmYSHU0D1UqZX2SrycKBEnoX/udYRCy+LU2xQWjVVHvGvcrebsfEE XWIqofPeX+2TXgqJobqsA4AsHmWvTSC2rRFw4K9x4PyDrsA1kPsVM5M0TrGoXg6Ys/KDBX DILsj3SrUQnUUBYFCN5v7SCZhXH90tDI8tO4vDBa61JBfC3L1Wqp5eOyQ2Oguo8l2aubmn He1gU5fAQfL0XZAnkeaU10mYn05BXPemkwvvzUFbCQlQqhMoivPAAxdx7shDTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VvM1m35XxzwKy; Wed, 5 Jun 2024 09:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 455938ZH093443; Wed, 5 Jun 2024 09:03:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4559389f093440; Wed, 5 Jun 2024 09:03:08 GMT (envelope-from git) Date: Wed, 5 Jun 2024 09:03:08 GMT Message-Id: <202406050903.4559389f093440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 8d7331e62a5a - main - nuageinit: fix authorized_key test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d7331e62a5aa75760ac54e3cb1594b0001645c6 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8d7331e62a5aa75760ac54e3cb1594b0001645c6 commit 8d7331e62a5aa75760ac54e3cb1594b0001645c6 Author: Baptiste Daroussin AuthorDate: 2024-06-05 08:58:17 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-05 09:00:54 +0000 nuageinit: fix authorized_key test After miss reading the cloudinit spec I ended up writting a wrong test for basic ssh key setup, nuageinit has been fixed, but not the test, here is the actual fix. Reported by: markj --- libexec/nuageinit/tests/nuageinit.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 926233bcf66d..42c95e1b2abd 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -173,16 +173,17 @@ EOF config2_pubkeys_body() { here=$(pwd) + export NUAGE_FAKE_ROOTDIR=$(pwd) if [ $(id -u) -ne 0 ]; then atf_skip "root required" fi mkdir -p media/nuageinit - cat > media/nuageinit/meta_data.json << EOF -{ - "public_keys": { - "mykey": "ssh-rsa AAAAB3NzaC1y...== Generated by Nova" - }, -} + touch media/nuageinit/meta_data.json + cat > media/nuageinit/user-data << EOF +#cloud-config + +ssh_authorized_keys: + - "ssh-rsa AAAAB3NzaC1y...== Generated by Nova" EOF mkdir -p etc cat > etc/master.passwd <