From d752d07d24d7548479eb0bd411a49c0303c1da36 Mon Sep 17 00:00:00 2001 From: SungWoongz Date: Tue, 20 Feb 2024 09:42:36 +0900 Subject: [PATCH] =?UTF-8?q?PR=EC=A0=84=20=EC=86=8C=EC=8A=A4=EC=A0=95?= =?UTF-8?q?=EB=A6=AC=20=EB=B0=8F=20=EC=A3=BC=EC=84=9D=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud-driver/drivers/aws/main/Test_Resources.go | 2 ++ .../cloud-driver/drivers/aws/resources/PriceInfoHandler.go | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cloud-control-manager/cloud-driver/drivers/aws/main/Test_Resources.go b/cloud-control-manager/cloud-driver/drivers/aws/main/Test_Resources.go index 93b1f011e..855903e8b 100644 --- a/cloud-control-manager/cloud-driver/drivers/aws/main/Test_Resources.go +++ b/cloud-control-manager/cloud-driver/drivers/aws/main/Test_Resources.go @@ -1761,6 +1761,8 @@ func handlePriceInfo() { // aws pricing get-attribute-values --service-code AmazonEC2 --attribute-name instanceType //result, err := handler.GetPriceInfo("AmazonEC2", "ap-northeast-2", filterList) + + // AmazonEC2는 ServiceCode고정 -> ProductFamily : Compute Instance로 두고 테스트 result, err := handler.GetPriceInfo("Compute Instance", "us-west-1", filterList) if err != nil { diff --git a/cloud-control-manager/cloud-driver/drivers/aws/resources/PriceInfoHandler.go b/cloud-control-manager/cloud-driver/drivers/aws/resources/PriceInfoHandler.go index f830d6a2f..ae9e8e9d8 100644 --- a/cloud-control-manager/cloud-driver/drivers/aws/resources/PriceInfoHandler.go +++ b/cloud-control-manager/cloud-driver/drivers/aws/resources/PriceInfoHandler.go @@ -78,7 +78,7 @@ func (priceInfoHandler *AwsPriceInfoHandler) GetPriceInfo(productFamily string, priceMap := make(map[string]irs.Price) // 전체 price를 id로 구분한 map - cblogger.Info("productFamily", productFamily) + cblogger.Info("productFamily : ", productFamily) cblogger.Info("filter value : ", filterList) requestProductsInputFilters, err := setProductsInputRequestFilter(filterList) @@ -113,7 +113,7 @@ func (priceInfoHandler *AwsPriceInfoHandler) GetPriceInfo(productFamily string, getProductsRequest := &pricing.GetProductsInput{ Filters: requestProductsInputFilters, - ServiceCode: aws.String("AmazonEC2"), + ServiceCode: aws.String("AmazonEC2"), // ServiceCode : AmazonEC2 고정 NextToken: nextToken, } cblogger.Info("get Products request", getProductsRequest) @@ -231,6 +231,7 @@ func (priceInfoHandler *AwsPriceInfoHandler) GetPriceInfo(productFamily string, if priceInfos.NextToken == nil { break } + // NextToken값이 있다면 설정 nextToken = priceInfos.NextToken } // end of nextToken for