diff --git a/main.c b/main.c index 6a4e463..b9566fd 100644 --- a/main.c +++ b/main.c @@ -47,7 +47,7 @@ #define OAPI_RAW_OUTPUT 1 -#define OAPI_CLI_VERSION "0.10.0" +#define OAPI_CLI_VERSION "0.11.0" #define OAPI_CLI_UAGENT "oapi-cli/"OAPI_CLI_VERSION"; osc-sdk-c/" diff --git a/osc-sdk-C b/osc-sdk-C index 6244d07..05b7a27 160000 --- a/osc-sdk-C +++ b/osc-sdk-C @@ -1 +1 @@ -Subproject commit 6244d074962d6fa6330f7f66bc3cd4f2ad7bdcf6 +Subproject commit 05b7a275cc40341b1372e2632986099022322231 diff --git a/osc_sdk.c b/osc_sdk.c index 3e4a071..8c57c71 100644 --- a/osc_sdk.c +++ b/osc_sdk.c @@ -511,13 +511,13 @@ static const char *calls_descriptions[] = { , "Usage: oapi-cli DisableOutscaleLoginForUsers [OPTIONS]\n" "null\n" "\nRequired Argument: null \n" , - "Usage: oapi-cli DisableOutscaleLoginPerUsers [OPTIONS]\n" "null\n" "\nRequired Argument: null \n" + "Usage: oapi-cli DisableOutscaleLoginPerUsers --UserNames=usernames [OPTIONS]\n" "null\n" "\nRequired Argument: UserNames \n" , "Usage: oapi-cli DisableOutscaleLogin [OPTIONS]\n" "null\n" "\nRequired Argument: null \n" , "Usage: oapi-cli EnableOutscaleLoginForUsers [OPTIONS]\n" "null\n" "\nRequired Argument: null \n" , - "Usage: oapi-cli EnableOutscaleLoginPerUsers [OPTIONS]\n" "null\n" "\nRequired Argument: null \n" + "Usage: oapi-cli EnableOutscaleLoginPerUsers --UserNames=usernames [OPTIONS]\n" "null\n" "\nRequired Argument: UserNames \n" , "Usage: oapi-cli EnableOutscaleLogin [OPTIONS]\n" "null\n" "\nRequired Argument: null \n" , @@ -4420,43 +4420,50 @@ static const char *calls_args_descriptions[] = { "--VpnOptions: ref VpnOptions\n" " Information about the VPN options.\n" " --VpnOptions.Phase1Options: ref Phase1Options\n" - " Information about Phase 1 of the Internet Key Exchange (IKE) \n" - " negotiation. When Phase 1 finishes successfully, peers proceed to Phase 2 \n" - " negotiations.\n" + " This parameter is not available. It is present in our API for the sake \n" + " of historical compatibility with AWS.\n" " --VpnOptions.Phase1Options.DpdTimeoutAction: string\n" - " The action to carry out after a Dead Peer Detection (DPD) timeout \n" - " occurs.\n" + " This parameter is not available. It is present in our API for the sake \n" + " of historical compatibility with AWS.\n" " --VpnOptions.Phase1Options.DpdTimeoutSeconds: long long int\n" - " The maximum waiting time for a Dead Peer Detection (DPD) response before \n" - " considering the peer as dead, in seconds.\n" + " This parameter is not available. It is present in our API for the sake \n" + " of historical compatibility with AWS.\n" " --VpnOptions.Phase1Options.IkeVersions: array string\n" - " The Internet Key Exchange (IKE) versions allowed for the VPN tunnel.\n" + " This parameter is not available. It is present in our API for the sake \n" + " of historical compatibility with AWS.\n" " --VpnOptions.Phase1Options.Phase1DhGroupNumbers: array integer\n" - " The Diffie-Hellman (DH) group numbers allowed for the VPN tunnel for \n" - " phase 1.\n" + " This parameter is not available. It is present in our API for the sake \n" + " of historical compatibility with AWS.\n" " --VpnOptions.Phase1Options.Phase1EncryptionAlgorithms: array string\n" - " The encryption algorithms allowed for the VPN tunnel for phase 1.\n" + " This parameter is not available. It is present in our API for the sake \n" + " of historical compatibility with AWS.\n" " --VpnOptions.Phase1Options.Phase1IntegrityAlgorithms: array string\n" - " The integrity algorithms allowed for the VPN tunnel for phase 1.\n" + " This parameter is not available. It is present in our API for the sake \n" + " of historical compatibility with AWS.\n" " --VpnOptions.Phase1Options.Phase1LifetimeSeconds: long long int\n" - " The lifetime for phase 1 of the IKE negotiation process, in seconds.\n" + " This parameter is not available. It is present in our API for the sake \n" + " of historical compatibility with AWS.\n" " --VpnOptions.Phase1Options.ReplayWindowSize: long long int\n" - " The number of packets in an IKE replay window.\n" + " This parameter is not available. It is present in our API for the sake \n" + " of historical compatibility with AWS.\n" " --VpnOptions.Phase1Options.StartupAction: string\n" - " The action to carry out when establishing tunnels for a VPN connection.\n" + " This parameter is not available. It is present in our API for the sake \n" + " of historical compatibility with AWS.\n" " --VpnOptions.Phase2Options: ref Phase2Options\n" " Information about Phase 2 of the Internet Key Exchange (IKE) \n" " negotiation.\n" " --VpnOptions.Phase2Options.Phase2DhGroupNumbers: array integer\n" - " The Diffie-Hellman (DH) group numbers allowed for the VPN tunnel for \n" - " phase 2.\n" + " This parameter is not available. It is present in our API for the sake \n" + " of historical compatibility with AWS.\n" " --VpnOptions.Phase2Options.Phase2EncryptionAlgorithms: array string\n" - " The encryption algorithms allowed for the VPN tunnel for phase 2.\n" + " This parameter is not available. It is present in our API for the sake \n" + " of historical compatibility with AWS.\n" " --VpnOptions.Phase2Options.Phase2IntegrityAlgorithms: array string\n" - " The integrity algorithms allowed for the VPN tunnel for phase 2.\n" + " This parameter is not available. It is present in our API for the sake \n" + " of historical compatibility with AWS.\n" " --VpnOptions.Phase2Options.Phase2LifetimeSeconds: long long int\n" - " The lifetime for phase 2 of the Internet Key Exchange (IKE) negotiation \n" - " process, in seconds.\n" + " This parameter is not available. It is present in our API for the sake \n" + " of historical compatibility with AWS.\n" " --VpnOptions.Phase2Options.PreSharedKey: string\n" " The pre-shared key to establish the initial authentication between the \n" " client gateway and the virtual gateway. This key can contain any \n" diff --git a/osc_sdk.h b/osc_sdk.h index a11bf98..126d6ce 100644 --- a/osc_sdk.h +++ b/osc_sdk.h @@ -77,8 +77,8 @@ struct osc_str { #define OSC_ENV_FREE_AK_SK (OSC_ENV_FREE_AK | OSC_ENV_FREE_SK) -#define OSC_API_VERSION "1.35.4" -#define OSC_SDK_VERSION 0X001600 +#define OSC_API_VERSION "1.35.5" +#define OSC_SDK_VERSION 0X001700 enum osc_auth_method { OSC_AKSK_METHOD, @@ -984,13 +984,12 @@ struct direct_link { */ char *region_name; /* - * The state of the DirectLink.
\n* `requested`: The DirectLink is - * requested but the request has not been validated yet.
\n* - * `pending`: The DirectLink request has been validated. It remains in - * the `pending` state until you establish the physical link.
\n* - * `available`: The physical link is established and the connection is - * ready to use.
\n* `deleting`: The deletion process is in - * progress.
\n* `deleted`: The DirectLink is deleted. + * The state of the DirectLink.\n\n */ char *state; }; @@ -5131,74 +5130,81 @@ struct permissions_on_resource_creation { struct phase1_options { /* - * The action to carry out after a Dead Peer Detection (DPD) timeout - * occurs. + * This parameter is not available. It is present in our API for the + * sake of historical compatibility with AWS. */ char *dpd_timeout_action; /* - * The maximum waiting time for a Dead Peer Detection (DPD) response - * before considering the peer as dead, in seconds. + * This parameter is not available. It is present in our API for the + * sake of historical compatibility with AWS. */ int is_set_dpd_timeout_seconds; long long int dpd_timeout_seconds; /* - * The Internet Key Exchange (IKE) versions allowed for the VPN tunnel. + * This parameter is not available. It is present in our API for the + * sake of historical compatibility with AWS. */ char *ike_versions_str; char **ike_versions; /* - * The Diffie-Hellman (DH) group numbers allowed for the VPN tunnel for - * phase 1. + * This parameter is not available. It is present in our API for the + * sake of historical compatibility with AWS. */ char *phase1_dh_group_numbers_str; int *phase1_dh_group_numbers; /* - * The encryption algorithms allowed for the VPN tunnel for phase 1. + * This parameter is not available. It is present in our API for the + * sake of historical compatibility with AWS. */ char *phase1_encryption_algorithms_str; char **phase1_encryption_algorithms; /* - * The integrity algorithms allowed for the VPN tunnel for phase 1. + * This parameter is not available. It is present in our API for the + * sake of historical compatibility with AWS. */ char *phase1_integrity_algorithms_str; char **phase1_integrity_algorithms; /* - * The lifetime for phase 1 of the IKE negotiation process, in seconds. + * This parameter is not available. It is present in our API for the + * sake of historical compatibility with AWS. */ int is_set_phase1_lifetime_seconds; long long int phase1_lifetime_seconds; /* - * The number of packets in an IKE replay window. + * This parameter is not available. It is present in our API for the + * sake of historical compatibility with AWS. */ int is_set_replay_window_size; long long int replay_window_size; /* - * The action to carry out when establishing tunnels for a VPN - * connection. + * This parameter is not available. It is present in our API for the + * sake of historical compatibility with AWS. */ char *startup_action; }; struct phase2_options { /* - * The Diffie-Hellman (DH) group numbers allowed for the VPN tunnel for - * phase 2. + * This parameter is not available. It is present in our API for the + * sake of historical compatibility with AWS. */ char *phase2_dh_group_numbers_str; int *phase2_dh_group_numbers; /* - * The encryption algorithms allowed for the VPN tunnel for phase 2. + * This parameter is not available. It is present in our API for the + * sake of historical compatibility with AWS. */ char *phase2_encryption_algorithms_str; char **phase2_encryption_algorithms; /* - * The integrity algorithms allowed for the VPN tunnel for phase 2. + * This parameter is not available. It is present in our API for the + * sake of historical compatibility with AWS. */ char *phase2_integrity_algorithms_str; char **phase2_integrity_algorithms; /* - * The lifetime for phase 2 of the Internet Key Exchange (IKE) - * negotiation process, in seconds. + * This parameter is not available. It is present in our API for the + * sake of historical compatibility with AWS. */ int is_set_phase2_lifetime_seconds; long long int phase2_lifetime_seconds; @@ -6116,7 +6122,7 @@ struct snapshot { char *snapshot_id; /* * The state of the snapshot (`in-queue` \\| `pending` \\| `completed` - * \\| `error` \\| `deleting`)). + * \\| `error` \\| `deleting`). */ char *state; /* @@ -7029,36 +7035,45 @@ struct volume { struct vpn_options { /* - * Information about Phase 1 of the Internet Key Exchange (IKE) - * negotiation. When Phase 1 finishes successfully, peers proceed to - * Phase 2 - * negotiations. + * This parameter is not available. It is present in our API for the + * sake + * of historical compatibility with AWS. * --Phase1Options.DpdTimeoutAction: string - * The action to carry out after a Dead Peer Detection (DPD) timeout - * occurs. + * This parameter is not available. It is present in our API for the + * sake + * of historical compatibility with AWS. * --Phase1Options.DpdTimeoutSeconds: long long int - * The maximum waiting time for a Dead Peer Detection (DPD) response - * before - * considering the peer as dead, in seconds. + * This parameter is not available. It is present in our API for the + * sake + * of historical compatibility with AWS. * --Phase1Options.IkeVersions: array string - * The Internet Key Exchange (IKE) versions allowed for the VPN - * tunnel. + * This parameter is not available. It is present in our API for the + * sake + * of historical compatibility with AWS. * --Phase1Options.Phase1DhGroupNumbers: array integer - * The Diffie-Hellman (DH) group numbers allowed for the VPN tunnel - * for - * phase 1. + * This parameter is not available. It is present in our API for the + * sake + * of historical compatibility with AWS. * --Phase1Options.Phase1EncryptionAlgorithms: array string - * The encryption algorithms allowed for the VPN tunnel for phase 1. + * This parameter is not available. It is present in our API for the + * sake + * of historical compatibility with AWS. * --Phase1Options.Phase1IntegrityAlgorithms: array string - * The integrity algorithms allowed for the VPN tunnel for phase 1. + * This parameter is not available. It is present in our API for the + * sake + * of historical compatibility with AWS. * --Phase1Options.Phase1LifetimeSeconds: long long int - * The lifetime for phase 1 of the IKE negotiation process, in - * seconds. + * This parameter is not available. It is present in our API for the + * sake + * of historical compatibility with AWS. * --Phase1Options.ReplayWindowSize: long long int - * The number of packets in an IKE replay window. + * This parameter is not available. It is present in our API for the + * sake + * of historical compatibility with AWS. * --Phase1Options.StartupAction: string - * The action to carry out when establishing tunnels for a VPN - * connection. + * This parameter is not available. It is present in our API for the + * sake + * of historical compatibility with AWS. */ char *phase1_options_str; int is_set_phase1_options; @@ -7067,17 +7082,21 @@ struct vpn_options { * Information about Phase 2 of the Internet Key Exchange (IKE) * negotiation. * --Phase2Options.Phase2DhGroupNumbers: array integer - * The Diffie-Hellman (DH) group numbers allowed for the VPN tunnel - * for - * phase 2. + * This parameter is not available. It is present in our API for the + * sake + * of historical compatibility with AWS. * --Phase2Options.Phase2EncryptionAlgorithms: array string - * The encryption algorithms allowed for the VPN tunnel for phase 2. + * This parameter is not available. It is present in our API for the + * sake + * of historical compatibility with AWS. * --Phase2Options.Phase2IntegrityAlgorithms: array string - * The integrity algorithms allowed for the VPN tunnel for phase 2. + * This parameter is not available. It is present in our API for the + * sake + * of historical compatibility with AWS. * --Phase2Options.Phase2LifetimeSeconds: long long int - * The lifetime for phase 2 of the Internet Key Exchange (IKE) - * negotiation - * process, in seconds. + * This parameter is not available. It is present in our API for the + * sake + * of historical compatibility with AWS. * --Phase2Options.PreSharedKey: string * The pre-shared key to establish the initial authentication * between the @@ -7181,60 +7200,68 @@ struct vpn_connection { /* * Information about the VPN options. * --VpnOptions.Phase1Options: ref Phase1Options - * Information about Phase 1 of the Internet Key Exchange (IKE) - * negotiation. When Phase 1 finishes successfully, peers proceed - * to Phase 2 - * negotiations. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase1Options.DpdTimeoutAction: string - * The action to carry out after a Dead Peer Detection (DPD) - * timeout - * occurs. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase1Options.DpdTimeoutSeconds: long long int - * The maximum waiting time for a Dead Peer Detection (DPD) - * response before - * considering the peer as dead, in seconds. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase1Options.IkeVersions: array string - * The Internet Key Exchange (IKE) versions allowed for the VPN - * tunnel. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase1Options.Phase1DhGroupNumbers: array integer - * The Diffie-Hellman (DH) group numbers allowed for the VPN - * tunnel for - * phase 1. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase1Options.Phase1EncryptionAlgorithms: array * string - * The encryption algorithms allowed for the VPN tunnel for - * phase 1. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase1Options.Phase1IntegrityAlgorithms: array * string - * The integrity algorithms allowed for the VPN tunnel for phase - * 1. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase1Options.Phase1LifetimeSeconds: long long int - * The lifetime for phase 1 of the IKE negotiation process, in - * seconds. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase1Options.ReplayWindowSize: long long int - * The number of packets in an IKE replay window. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase1Options.StartupAction: string - * The action to carry out when establishing tunnels for a VPN - * connection. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase2Options: ref Phase2Options * Information about Phase 2 of the Internet Key Exchange (IKE) * negotiation. * --VpnOptions.Phase2Options.Phase2DhGroupNumbers: array integer - * The Diffie-Hellman (DH) group numbers allowed for the VPN - * tunnel for - * phase 2. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase2Options.Phase2EncryptionAlgorithms: array * string - * The encryption algorithms allowed for the VPN tunnel for - * phase 2. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase2Options.Phase2IntegrityAlgorithms: array * string - * The integrity algorithms allowed for the VPN tunnel for phase - * 2. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase2Options.Phase2LifetimeSeconds: long long int - * The lifetime for phase 2 of the Internet Key Exchange (IKE) - * negotiation - * process, in seconds. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase2Options.PreSharedKey: string * The pre-shared key to establish the initial authentication * between the @@ -10246,7 +10273,7 @@ struct osc_disable_outscale_login_for_users_arg { }; struct osc_disable_outscale_login_per_users_arg { - /* Required: null + /* Required: UserNames */ /* * If true, checks whether you have the required permissions to perform @@ -10285,7 +10312,7 @@ struct osc_enable_outscale_login_for_users_arg { }; struct osc_enable_outscale_login_per_users_arg { - /* Required: null + /* Required: UserNames */ /* * If true, checks whether you have the required permissions to perform @@ -14854,60 +14881,68 @@ struct osc_update_vpn_connection_arg { /* * Information about the VPN options. * --VpnOptions.Phase1Options: ref Phase1Options - * Information about Phase 1 of the Internet Key Exchange (IKE) - * negotiation. When Phase 1 finishes successfully, peers proceed - * to Phase 2 - * negotiations. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase1Options.DpdTimeoutAction: string - * The action to carry out after a Dead Peer Detection (DPD) - * timeout - * occurs. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase1Options.DpdTimeoutSeconds: long long int - * The maximum waiting time for a Dead Peer Detection (DPD) - * response before - * considering the peer as dead, in seconds. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase1Options.IkeVersions: array string - * The Internet Key Exchange (IKE) versions allowed for the VPN - * tunnel. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase1Options.Phase1DhGroupNumbers: array integer - * The Diffie-Hellman (DH) group numbers allowed for the VPN - * tunnel for - * phase 1. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase1Options.Phase1EncryptionAlgorithms: array * string - * The encryption algorithms allowed for the VPN tunnel for - * phase 1. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase1Options.Phase1IntegrityAlgorithms: array * string - * The integrity algorithms allowed for the VPN tunnel for phase - * 1. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase1Options.Phase1LifetimeSeconds: long long int - * The lifetime for phase 1 of the IKE negotiation process, in - * seconds. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase1Options.ReplayWindowSize: long long int - * The number of packets in an IKE replay window. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase1Options.StartupAction: string - * The action to carry out when establishing tunnels for a VPN - * connection. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase2Options: ref Phase2Options * Information about Phase 2 of the Internet Key Exchange (IKE) * negotiation. * --VpnOptions.Phase2Options.Phase2DhGroupNumbers: array integer - * The Diffie-Hellman (DH) group numbers allowed for the VPN - * tunnel for - * phase 2. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase2Options.Phase2EncryptionAlgorithms: array * string - * The encryption algorithms allowed for the VPN tunnel for - * phase 2. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase2Options.Phase2IntegrityAlgorithms: array * string - * The integrity algorithms allowed for the VPN tunnel for phase - * 2. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase2Options.Phase2LifetimeSeconds: long long int - * The lifetime for phase 2 of the Internet Key Exchange (IKE) - * negotiation - * process, in seconds. + * This parameter is not available. It is present in our API for + * the sake + * of historical compatibility with AWS. * --VpnOptions.Phase2Options.PreSharedKey: string * The pre-shared key to establish the initial authentication * between the diff --git a/version b/version index 78bc1ab..d9df1bb 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.10.0 +0.11.0