Skip to content

Commit

Permalink
Version 3.202402.1
Browse files Browse the repository at this point in the history
  • Loading branch information
jung-thomas committed Feb 3, 2024
1 parent 58a52cf commit e614b31
Show file tree
Hide file tree
Showing 8 changed files with 3,134 additions and 1,350 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
[
{
"date": "2024-02-03",
"version": "3.202402.1",
"Changed": [
"[CAP version 7.6.0](https://cap.cloud.sap/docs/releases/jan24)",
"Fix cds bind auth on the cds command",
"Upgrade Inquirer"
]
},
{
"date": "2023-12-11",
"version": "3.202312.1",
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/).

## [3.202402.1] - 2024-02-03

**Changed**

- [CAP version 7.6.0](https://cap.cloud.sap/docs/releases/jan24)
- Fix cds bind auth on the cds command
- Upgrade Inquirer

## [3.202312.1] - 2023-12-11

**Changed**
Expand Down
4 changes: 2 additions & 2 deletions app/resources/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>hana-cli LaunchPad</title>
<script src="https://ui5.sap.com/1.120.1/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
<script src="https://ui5.sap.com/1.120.1/resources/sap-ui-core.js"
<script src="https://ui5.sap.com/1.120.5/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
<script src="https://ui5.sap.com/1.120.5/resources/sap-ui-core.js"
data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout, sap.ui.rta, sap.dfa.help,sap.uxap"
data-sap-ui-compatVersion="edge" data-sap-ui-theme="sap_horizon" data-sap-ui-async="true"
data-sap-ui-frameOptions="trusted" data-sap-ui-bindingSyntax="complex" data-sap-ui-xx-bindingSyntax="complex"
Expand Down
6 changes: 4 additions & 2 deletions bin/btp.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// @ts-check
import * as base from '../utils/base.js'
import * as btp from '../utils/btp.js'
import inquirer from 'inquirer'
import { TreePrompt } from '../utils/inquirer-tree-prompt.js'
const colors = base.colors

export const command = 'btp [directory] [subaccount]'
Expand All @@ -26,8 +28,8 @@ export async function handler(argv) {
}

base.debug(`build inquirer prompts`)
const inquirer = base.require('inquirer')
const TreePrompt = base.require('inquirer-tree-prompt')
//const inquirer = base.require('inquirer')
// const TreePrompt = base.require('inquirer-tree-prompt')

try {
base.debug(`GetBTPGlobalAccount`)
Expand Down
21 changes: 21 additions & 0 deletions bin/cds.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,27 @@ export async function cdsBuild(prompts) {
vcap.hana[0].credentials.schema = object[0].SCHEMA_NAME
vcap.hana.splice(1, 100)
process.env.VCAP_SERVICES = JSON.stringify(vcap)
}

if (!cds.env.requires.db.credentials) {
const settings = db.client._settings
let out = {}
out.schema = object[0].SCHEMA_NAME
out.url = settings.url
out.certificate = settings.certificate
out.database_id = settings.database_id
out.driver = settings.driver
out.hdi_user = settings.hdi_user
out.hdi_password = settings.hdi_password
out.host = settings.host
out.user = settings.user
out.password = settings.password
out.port = settings.port
out.pooling = settings.pooling
out.encrypt = true
out.sslValidateCertificate = false
out.useTLS = true
cds.env.requires.db.credentials = out
}

cdsSource +=
Expand Down
Loading

0 comments on commit e614b31

Please sign in to comment.