From 19304ad924bfd431d983b1d5ce704735f3caefd3 Mon Sep 17 00:00:00 2001 From: Lars Hvam Date: Tue, 3 Aug 2021 06:49:45 +0200 Subject: [PATCH] change local hostname determination (#4885) * change local hostname determination * fix --- src/http/zcl_abapgit_http.clas.abap | 26 ++++++++------------------ src/zif_abapgit_exit.intf.abap | 4 +--- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/src/http/zcl_abapgit_http.clas.abap b/src/http/zcl_abapgit_http.clas.abap index dcbdad4b1..0342dfd29 100644 --- a/src/http/zcl_abapgit_http.clas.abap +++ b/src/http/zcl_abapgit_http.clas.abap @@ -48,7 +48,7 @@ ENDCLASS. -CLASS ZCL_ABAPGIT_HTTP IMPLEMENTATION. +CLASS zcl_abapgit_http IMPLEMENTATION. METHOD acquire_login_details. @@ -225,34 +225,24 @@ CLASS ZCL_ABAPGIT_HTTP IMPLEMENTATION. METHOD is_local_system. DATA: lv_host TYPE string, - lt_list TYPE zif_abapgit_exit=>ty_icm_sinfo2_tt, + lt_list TYPE zif_abapgit_definitions=>ty_string_tt, li_exit TYPE REF TO zif_abapgit_exit. FIELD-SYMBOLS: LIKE LINE OF lt_list. - CALL FUNCTION 'ICM_GET_INFO2' - TABLES - servlist = lt_list - EXCEPTIONS - icm_error = 1 - icm_timeout = 2 - OTHERS = 3. - IF sy-subrc <> 0. - RETURN. - ENDIF. + cl_http_server=>get_location( IMPORTING host = lv_host ). + APPEND lv_host TO lt_list. - APPEND INITIAL LINE TO lt_list ASSIGNING . - -hostname = 'localhost'. + APPEND 'localhost' TO lt_list. li_exit = zcl_abapgit_exit=>get_instance( ). li_exit->change_local_host( CHANGING ct_hosts = lt_list ). - FIND REGEX 'https?://([^/^:]*)' IN iv_url - SUBMATCHES lv_host. + FIND REGEX 'https?://([^/^:]*)' IN iv_url SUBMATCHES lv_host. - READ TABLE lt_list WITH KEY hostname = lv_host TRANSPORTING NO FIELDS. + READ TABLE lt_list WITH KEY table_line = lv_host TRANSPORTING NO FIELDS. rv_bool = boolc( sy-subrc = 0 ). ENDMETHOD. -ENDCLASS. +ENDCLASS. \ No newline at end of file diff --git a/src/zif_abapgit_exit.intf.abap b/src/zif_abapgit_exit.intf.abap index 5c976a568..40868eeb0 100644 --- a/src/zif_abapgit_exit.intf.abap +++ b/src/zif_abapgit_exit.intf.abap @@ -2,8 +2,6 @@ INTERFACE zif_abapgit_exit PUBLIC . - TYPES: - ty_icm_sinfo2_tt TYPE STANDARD TABLE OF icm_sinfo2 WITH DEFAULT KEY . TYPES: BEGIN OF ty_ci_repo, name TYPE string, @@ -27,7 +25,7 @@ INTERFACE zif_abapgit_exit VALUE(rv_allowed) TYPE abap_bool . METHODS change_local_host CHANGING - !ct_hosts TYPE ty_icm_sinfo2_tt . + !ct_hosts TYPE zif_abapgit_definitions=>ty_string_tt . METHODS change_proxy_authentication IMPORTING !iv_repo_url TYPE csequence