certmanager updates

This commit is contained in:
Олег Бородин
2024-08-10 10:19:56 +02:00
parent a21b4e2db9
commit 1cdbd2b034
29 changed files with 2341 additions and 1088 deletions

View File

@@ -40,6 +40,9 @@ func TestIssuerCreateN0(t *testing.T) {
}
ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
userID, err := lg.SeedAccount(ctx)
require.NoError(t, err)
require.NotZero(t, userID)
signerCommonName := "make.love"
var signerID int64
@@ -49,7 +52,7 @@ func TestIssuerCreateN0(t *testing.T) {
createIssuerPairParams := &cmctl.CreateIssuerPairParams{
IssuerCommonName: signerCommonName,
}
createIssuerPairRes, err := lg.CreateIssuerPair(ctx, createIssuerPairParams)
createIssuerPairRes, err := lg.CreateIssuerPair(ctx, userID, createIssuerPairParams)
require.NoError(t, err)
require.NotNil(t, createIssuerPairRes)
@@ -83,7 +86,7 @@ func TestIssuerCreateN0(t *testing.T) {
IssuerCommonName: issuerCommonName,
SignerID: signerID,
}
createIssuerPairRes, err := lg.CreateIssuerPair(ctx, createIssuerPairParams)
createIssuerPairRes, err := lg.CreateIssuerPair(ctx, userID, createIssuerPairParams)
require.NoError(t, err)
require.NotNil(t, createIssuerPairRes)
@@ -120,7 +123,7 @@ func TestIssuerCreateN0(t *testing.T) {
InetAddresses: []string{"1.1.1.1", "1.1.1.2", "1.1.1.3"},
Hostnames: []string{"dont.worry", "be.happy"},
}
createServicePairRes, err := lg.CreateServicePair(ctx, createServicePairParams)
createServicePairRes, err := lg.CreateServicePair(ctx, userID, createServicePairParams)
require.NoError(t, err)
require.NotNil(t, createServicePairRes)
@@ -150,7 +153,7 @@ func TestIssuerCreateN0(t *testing.T) {
}
{
listIssuerPairsParams := &cmctl.ListIssuerPairsParams{}
listIssuerPairsRes, err := lg.ListIssuerPairs(ctx, listIssuerPairsParams)
listIssuerPairsRes, err := lg.ListIssuerPairs(ctx, userID, listIssuerPairsParams)
require.NoError(t, err)
require.NotNil(t, listIssuerPairsRes)
require.NotZero(t, len(listIssuerPairsRes.Issuers))
@@ -161,7 +164,7 @@ func TestIssuerCreateN0(t *testing.T) {
getServicePairParams := &cmctl.GetServicePairParams{
ServiceID: serviceID,
}
getServicePairRes, err := lg.GetServicePair(ctx, getServicePairParams)
getServicePairRes, err := lg.GetServicePair(ctx, userID, getServicePairParams)
require.NoError(t, err)
require.NotNil(t, getServicePairRes)
require.NotZero(t, len(getServicePairRes.Certificate))
@@ -173,7 +176,7 @@ func TestIssuerCreateN0(t *testing.T) {
getIssuerCertificateParams := &cmctl.GetIssuerCertificateParams{
IssuerID: issuerID,
}
getIssuerCertificateRes, err := lg.GetIssuerCertificate(ctx, getIssuerCertificateParams)
getIssuerCertificateRes, err := lg.GetIssuerCertificate(ctx, userID, getIssuerCertificateParams)
require.NoError(t, err)
require.NotNil(t, getIssuerCertificateRes)
require.NotZero(t, len(getIssuerCertificateRes.Certificate))
@@ -208,6 +211,9 @@ func XXXTestIssuerCreateN2(t *testing.T) {
}
ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
userID, err := lg.SeedAccount(ctx)
require.NoError(t, err)
require.NotZero(t, userID)
issuerCommonName := "foo.bar"
var issuerID int64
@@ -216,7 +222,7 @@ func XXXTestIssuerCreateN2(t *testing.T) {
createIssuerPairParams := &cmctl.CreateIssuerPairParams{
IssuerCommonName: issuerCommonName,
}
createIssuerPairRes, err := lg.CreateIssuerPair(ctx, createIssuerPairParams)
createIssuerPairRes, err := lg.CreateIssuerPair(ctx, userID, createIssuerPairParams)
require.NoError(t, err)
require.NotNil(t, createIssuerPairRes)
issuerID = createIssuerPairRes.IssuerID
@@ -227,7 +233,7 @@ func XXXTestIssuerCreateN2(t *testing.T) {
getIssuerCertificateParams := &cmctl.GetIssuerCertificateParams{
IssuerID: issuerID,
}
getIssuerCertificateRes, err := lg.GetIssuerCertificate(ctx, getIssuerCertificateParams)
getIssuerCertificateRes, err := lg.GetIssuerCertificate(ctx, userID, getIssuerCertificateParams)
require.NoError(t, err)
require.NotNil(t, getIssuerCertificateRes)
require.NotZero(t, len(getIssuerCertificateRes.Certificate))
@@ -243,7 +249,7 @@ func XXXTestIssuerCreateN2(t *testing.T) {
revokeIssuerPairParams := &cmctl.RevokeIssuerPairParams{
IssuerID: issuerID,
}
revokeIssuerPairRes, err := lg.RevokeIssuerPair(ctx, revokeIssuerPairParams)
revokeIssuerPairRes, err := lg.RevokeIssuerPair(ctx, userID, revokeIssuerPairParams)
require.NoError(t, err)
require.NotNil(t, revokeIssuerPairRes)
@@ -254,7 +260,7 @@ func XXXTestIssuerCreateN2(t *testing.T) {
getIssuerCertificateParams := &cmctl.GetIssuerCertificateParams{
IssuerID: issuerID,
}
getIssuerCertificateRes, err := lg.GetIssuerCertificate(ctx, getIssuerCertificateParams)
getIssuerCertificateRes, err := lg.GetIssuerCertificate(ctx, userID, getIssuerCertificateParams)
require.NoError(t, err)
require.NotNil(t, getIssuerCertificateRes)
require.NotZero(t, len(getIssuerCertificateRes.Certificate))
@@ -266,7 +272,7 @@ func XXXTestIssuerCreateN2(t *testing.T) {
unrevokeIssuerPairParams := &cmctl.UnrevokeIssuerPairParams{
IssuerID: issuerID,
}
unrevokeIssuerPairRes, err := lg.UnrevokeIssuerPair(ctx, unrevokeIssuerPairParams)
unrevokeIssuerPairRes, err := lg.UnrevokeIssuerPair(ctx, userID, unrevokeIssuerPairParams)
require.NoError(t, err)
require.NotNil(t, unrevokeIssuerPairRes)
@@ -277,7 +283,7 @@ func XXXTestIssuerCreateN2(t *testing.T) {
getIssuerCertificateParams := &cmctl.GetIssuerCertificateParams{
IssuerID: issuerID,
}
getIssuerCertificateRes, err := lg.GetIssuerCertificate(ctx, getIssuerCertificateParams)
getIssuerCertificateRes, err := lg.GetIssuerCertificate(ctx, userID, getIssuerCertificateParams)
require.NoError(t, err)
require.NotNil(t, getIssuerCertificateRes)
require.NotZero(t, len(getIssuerCertificateRes.Certificate))
@@ -287,7 +293,7 @@ func XXXTestIssuerCreateN2(t *testing.T) {
}
{
listIssuerPairsParams := &cmctl.ListIssuerPairsParams{}
listIssuerPairsRes, err := lg.ListIssuerPairs(ctx, listIssuerPairsParams)
listIssuerPairsRes, err := lg.ListIssuerPairs(ctx, userID, listIssuerPairsParams)
require.NoError(t, err)
require.NotNil(t, listIssuerPairsRes)
require.NotZero(t, len(listIssuerPairsRes.Issuers))
@@ -299,7 +305,7 @@ func XXXTestIssuerCreateN2(t *testing.T) {
createIssuerPairParams := &cmctl.CreateIssuerPairParams{
IssuerCommonName: fmt.Sprintf("sub%0d.%s", i, issuerCommonName),
}
createIssuerPairRes, err := lg.CreateIssuerPair(ctx, createIssuerPairParams)
createIssuerPairRes, err := lg.CreateIssuerPair(ctx, userID, createIssuerPairParams)
require.NoError(t, err)
require.NotNil(t, createIssuerPairRes)
issuerID = createIssuerPairRes.IssuerID
@@ -308,7 +314,7 @@ func XXXTestIssuerCreateN2(t *testing.T) {
}
{
listIssuerPairsParams := &cmctl.ListIssuerPairsParams{}
listIssuerPairsRes, err := lg.ListIssuerPairs(ctx, listIssuerPairsParams)
listIssuerPairsRes, err := lg.ListIssuerPairs(ctx, userID, listIssuerPairsParams)
require.NoError(t, err)
require.NotNil(t, listIssuerPairsRes)
require.NotZero(t, len(listIssuerPairsRes.Issuers))
@@ -322,7 +328,7 @@ func XXXTestIssuerCreateN2(t *testing.T) {
ServiceCommonName: serviceCommonName,
IssuerID: issuerID,
}
createServicePairRes, err := lg.CreateServicePair(ctx, createServicePairParams)
createServicePairRes, err := lg.CreateServicePair(ctx, userID, createServicePairParams)
printObj("createServicePairRes", createServicePairRes)
require.NoError(t, err)
@@ -334,7 +340,7 @@ func XXXTestIssuerCreateN2(t *testing.T) {
getServicePairParams := &cmctl.GetServicePairParams{
ServiceID: serviceID,
}
getServicePairRes, err := lg.GetServicePair(ctx, getServicePairParams)
getServicePairRes, err := lg.GetServicePair(ctx, userID, getServicePairParams)
require.NoError(t, err)
require.NotNil(t, getServicePairRes)
require.NotZero(t, len(getServicePairRes.Certificate))

View File

@@ -43,6 +43,10 @@ func XXXTestLogicImportIssuer(t *testing.T) {
require.NoError(t, err)
require.NotNil(t, lg)
}
ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
userID, err := lg.SeedAccount(ctx)
require.NoError(t, err)
require.NotZero(t, userID)
certBytes, err := os.ReadFile("testchain_a00.crt")
require.NoError(t, err)
@@ -80,13 +84,12 @@ func XXXTestLogicImportIssuer(t *testing.T) {
certStrings = append(certStrings, certString)
}
ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
{
importIssuerPairParams := &cmapi.ImportIssuerPairParams{
Certificate: certString,
Key: keyString,
}
importIssuerPairRes, err := lg.ImportIssuerPair(ctx, importIssuerPairParams)
importIssuerPairRes, err := lg.ImportIssuerPair(ctx, userID, importIssuerPairParams)
require.NoError(t, err)
require.NotNil(t, importIssuerPairRes)