Fix

Author: artemgavrilov

contrib/pg_tde/src/keyring/keyring_vault.c

@@ -33,7 +33,7 @@ typedef enum
 	JRESP_EXPECT_KEY
 } JsonVaultRespSemState;
 
-typedef enum // TODO
+typedef enum
 {
 	JRESP_MOUNT_INFO_EXPECT_TOPLEVEL_FIELD,
 	JRESP_MOUNT_INFO_EXPECT_TYPE_VALUE,
@@ -64,8 +64,8 @@ typedef struct JsonVaultMountInfoState
 	JsonVaultRespMountInfoSemState state;
  	int			level;
 
-	char *type;
-	char *version;
+	char	   *type;
+	char	   *version;
 } JsonVaultMountInfoState;
 
 static JsonParseErrorType json_resp_object_start(void *state);
@@ -314,9 +314,9 @@ static void
 validate(GenericKeyring *keyring)
 {
 	VaultV2Keyring *vault_keyring = (VaultV2Keyring *) keyring;
-	char	url[VAULT_URL_MAX_LEN];
-	CurlString str;
-	long httpCode = 0;
+	char		url[VAULT_URL_MAX_LEN];
+	CurlString	str;
+	long		httpCode = 0;
 	JsonParseErrorType json_error;
 	JsonLexContext *jlex = NULL;
 	JsonVaultMountInfoState parse;
@@ -325,40 +325,35 @@ validate(GenericKeyring *keyring)
 
 	if (!curl_perform(vault_keyring, url, &str, &httpCode, NULL))
 	{
-		ereport(WARNING,
+		ereport(ERROR,
 				errmsg("HTTP(S) request to keyring provider \"%s\" failed",
-				   vault_keyring->keyring.provider_name));
-		goto cleanup;
+					   vault_keyring->keyring.provider_name));
 	}
 
 	if (httpCode != 200)
 	{
-		ereport(WARNING,
+		ereport(ERROR,
 				errmsg("Failed to get mount info for \"%s\" at mountpoint \"%s\" (HTTP %ld)",
-				   vault_keyring->vault_url, vault_keyring->vault_mount_path, httpCode));
-		goto cleanup;
+					   vault_keyring->vault_url, vault_keyring->vault_mount_path, httpCode));
 	}
 
 	jlex = makeJsonLexContextCstringLen(NULL, str.ptr, str.len, PG_UTF8, true);
 	json_error = parse_vault_mount_info(&parse, jlex);
 
 	if (json_error != JSON_SUCCESS)
 	{
-		ereport(WARNING,
+		ereport(ERROR,
 				errmsg("Failed to parse mount info for \"%s\" at mountpoint \"%s\": %s",
-				   vault_keyring->vault_url, vault_keyring->vault_mount_path, json_errdetail(json_error, jlex)));
-		goto cleanup;
+					   vault_keyring->vault_url, vault_keyring->vault_mount_path, json_errdetail(json_error, jlex)));
 	}
 
 	if (strcmp(parse.type, "kv") != 0 || strcmp(parse.version, "2") != 0)
 	{
 		ereport(ERROR,
-			errmsg("Vault mount at '%s' is not a KV version 2 engine (type=kv, version=2 required)",
-				vault_keyring->vault_mount_path));
-		goto cleanup;
+				errmsg("Vault mount at '%s' is not a KV version 2 engine (type=kv, version=2 required)",
+					   vault_keyring->vault_mount_path));
 	}
 
-cleanup:
 	if (str.ptr != NULL)
 		pfree(str.ptr);
 
@@ -494,7 +489,8 @@ parse_vault_mount_info(JsonVaultMountInfoState *state, JsonLexContext *lex)
 	return pg_parse_json(lex, &sem);
 }
 
-static JsonParseErrorType json_mountinfo_object_start(void *state)
+static JsonParseErrorType 
+json_mountinfo_object_start(void *state)
 {
 	JsonVaultMountInfoState *parse = (JsonVaultMountInfoState *) state;
 
@@ -513,7 +509,8 @@ static JsonParseErrorType json_mountinfo_object_start(void *state)
 	return JSON_SUCCESS;
 }
 
-static JsonParseErrorType json_mountinfo_object_end(void *state)
+static JsonParseErrorType 
+json_mountinfo_object_end(void *state)
 {
 	JsonVaultMountInfoState *parse = (JsonVaultMountInfoState *) state;
 
@@ -525,7 +522,8 @@ static JsonParseErrorType json_mountinfo_object_end(void *state)
 	return JSON_SUCCESS;
 }
 
-static JsonParseErrorType json_mountinfo_scalar(void *state, char *token, JsonTokenType tokentype)
+static JsonParseErrorType 
+json_mountinfo_scalar(void *state, char *token, JsonTokenType tokentype)
 {
 	JsonVaultMountInfoState *parse = (JsonVaultMountInfoState *) state;
 
@@ -547,7 +545,8 @@ static JsonParseErrorType json_mountinfo_scalar(void *state, char *token, JsonTo
 	return JSON_SUCCESS;
 }
 
-static JsonParseErrorType json_mountinfo_object_field_start(void *state, char *fname, bool isnull)
+static JsonParseErrorType 
+json_mountinfo_object_field_start(void *state, char *fname, bool isnull)
 {
 	JsonVaultMountInfoState *parse = (JsonVaultMountInfoState *) state;