test1

DennisHeimbigner · Dec 1, 2023 · 1341c5f · 1341c5f
1 parent 0c6fd78
commit 1341c5f
Show file tree

Hide file tree

Showing 16 changed files with 659 additions and 578 deletions.
diff --git a/.github/workflows/run_tests_osx.yml b/.github/workflows/run_tests_osx.yml
@@ -6,7 +6,7 @@
 
 name: Run macOS-based netCDF Tests
 
-on: [pull_request,workflow_dispatch]
+on: [push,pull_request,workflow_dispatch]
 
 concurrency:  
   group: ${{ github.workflow}}-${{ github.head_ref }}  

diff --git a/.github/workflows/run_tests_s3.yml b/.github/workflows/run_tests_s3.yml
@@ -9,7 +9,7 @@
 
 name: Run S3 netCDF Tests (under Ubuntu Linux)
 
-on: [workflow_dispatch]
+on: [push,workflow_dispatch]
 
 concurrency:  
   group: ${{ github.workflow}}-${{ github.head_ref }}  

diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml
@@ -4,7 +4,7 @@
 
 name: Run Ubuntu/Linux netCDF Tests
 
-on: [pull_request, workflow_dispatch]
+on: [push,pull_request, workflow_dispatch]
 
 concurrency:  
   group: ${{ github.workflow}}-${{ github.head_ref }}  

diff --git a/.github/workflows/run_tests_win_cygwin.yml b/.github/workflows/run_tests_win_cygwin.yml
@@ -1,6 +1,6 @@
 name: Run Cygwin-based tests
 
-on: [pull_request,workflow_dispatch]
+on: [push,pull_request,workflow_dispatch]
 
 concurrency:  
   group: ${{ github.workflow}}-${{ github.head_ref }}  

diff --git a/.github/workflows/run_tests_win_mingw.yml b/.github/workflows/run_tests_win_mingw.yml
@@ -9,7 +9,7 @@ name: Run MSYS2, MinGW64-based Tests (Not Visual Studio)
 env:
   CPPFLAGS: "-D_BSD_SOURCE"
 
-on: [pull_request,workflow_dispatch]
+on: [push,pull_request,workflow_dispatch]
 
 concurrency:  
   group: ${{ github.workflow}}-${{ github.head_ref }}  

diff --git a/include/nc4internal.h b/include/nc4internal.h
@@ -332,6 +332,13 @@ typedef struct NCglobalstate {
     struct GlobalZarr { /* Zarr specific parameters */
 	char dimension_separator;
     } zarr;
+    struct GlobalAWS { /* AWS S3 specific parameters/defaults */
+	char* default_region;
+	char* config_file;
+	char* profile;
+	char* access_key_id;
+	char* secret_access_key;
+    } aws;
     struct Alignment { /* H5Pset_alignment parameters */
         int defined; /* 1 => threshold and alignment explicitly set */
 	int threshold;

diff --git a/include/ncrc.h b/include/ncrc.h
@@ -33,16 +33,6 @@ typedef struct NCRCentry {
         char* value;
 } NCRCentry;
 
-struct AWSentry {
-    char* key;
-    char* value;
-};
-
-struct AWSprofile {
-    char* name;
-    NClist* entries; /* NClist<struct AWSentry*> */
-};
-
 /* collect all the relevant info around the rc file and AWS */
 typedef struct NCRCinfo {
 	int ignore; /* if 1, then do not use any rc file */
@@ -91,14 +81,6 @@ EXTERNL int NC_testpathmode(const char* path, const char* tag);
 EXTERNL int NC_split_delim(const char* path, char delim, NClist* segments);
 EXTERNL int NC_join(struct NClist* segments, char** pathp);
 
-/* From ds3util.c */
-/* S3 profiles */
-EXTERNL int NC_getactives3profile(NCURI* uri, const char** profilep);
-EXTERNL int NC_s3profilelookup(const char* profile, const char* key, const char** valuep);
-EXTERNL int NC_authgets3profile(const char* profile, struct AWSprofile** profilep);
-EXTERNL int NC_iss3(NCURI* uri);
-EXTERNL int NC_s3urlrebuild(NCURI* url, struct NCS3INFO* s3, NCURI** newurlp);
-
 #if defined(__cplusplus)
 }
 #endif

diff --git a/include/ncs3sdk.h b/include/ncs3sdk.h
@@ -21,6 +21,20 @@ typedef struct NCS3INFO {
     NCS3SVC svc;
 } NCS3INFO;
 
+struct AWSentry {
+    char* key;
+    char* value;
+};
+
+struct AWSprofile {
+    char* name;
+    struct NClist* entries; /* NClist<struct AWSentry*> */
+};
+
+/* Opaque Types */
+struct NClist;
+struct NCglobalstate;
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -38,13 +52,23 @@ EXTERNL int NC_s3sdkclose(void* s3client0, NCS3INFO* info, int deleteit, char**
 EXTERNL int NC_s3sdkgetkeys(void* s3client0, const char* bucket, const char* prefix, size_t* nkeysp, char*** keysp, char** errmsgp);
 EXTERNL int NC_s3sdksearch(void* s3client0, const char* bucket, const char* prefixkey0, size_t* nkeysp, char*** keysp, char** errmsgp);
 EXTERNL int NC_s3sdkdeletekey(void* client0, const char* bucket, const char* pathkey, char** errmsgp);
-EXTERNL const char* NC_s3dumps3info(NCS3INFO* info);
 
 /* From ds3util.c */
+EXTERNL int NC_s3sdkinitialize(void);
+EXTERNL int NC_s3sdkfinalize(void);
+
 EXTERNL int NC_getdefaults3region(NCURI* uri, const char** regionp);
 EXTERNL int NC_s3urlprocess(NCURI* url, NCS3INFO* s3, NCURI** newurlp);
 EXTERNL int NC_s3clear(NCS3INFO* s3);
 EXTERNL int NC_s3clone(NCS3INFO* s3, NCS3INFO** news3p);
+EXTERNL const char* NC_s3dumps3info(NCS3INFO* info);
+EXTERNL void NC_s3freeprofilelist(struct NClist* profiles);
+EXTERNL int NC_getactives3profile(NCURI* uri, const char** profilep);
+EXTERNL int NC_s3profilelookup(const char* profile, const char* key, const char** valuep);
+EXTERNL int NC_authgets3profile(const char* profile, struct AWSprofile** profilep);
+EXTERNL int NC_iss3(NCURI* uri);
+EXTERNL int NC_s3urlrebuild(NCURI* url, struct NCS3INFO* s3, NCURI** newurlp);
+EXTERNL int NC_aws_load_credentials(struct NCglobalstate* gstate);
 
 #ifdef __cplusplus
 }

diff --git a/libdispatch/dauth.c b/libdispatch/dauth.c
@@ -17,9 +17,10 @@ See COPYRIGHT for license information.
 #include "netcdf.h"
 #include "ncbytes.h"
 #include "ncuri.h"
-#include "ncauth.h"
 #include "nclog.h"
 #include "ncpathmgr.h"
+#include "ncs3sdk.h"
+#include "ncauth.h"
 
 #ifdef _MSC_VER
 #include <windows.h>

diff --git a/libdispatch/ddispatch.c b/libdispatch/ddispatch.c
@@ -134,12 +134,12 @@ int
 NCDISPATCH_finalize(void)
 {
     int status = NC_NOERR;
-    NC_freeglobalstate();
 #if defined(ENABLE_BYTERANGE) || defined(ENABLE_DAP) || defined(ENABLE_DAP4)
     curl_global_cleanup();
 #endif
 #if defined(ENABLE_DAP4)
    ncxml_finalize();
 #endif
+    NC_freeglobalstate(); /* should be one of the last things done */
     return status;
 }